Fixes improvements (4/32)

Fixes improvements