Fixes improvements (11/32)

Fixes improvements