Fixes improvements (1/32)

Fixes improvements