Fixes improvements (8/32)

Fixes improvements