Fixes improvements (24/32)

Fixes improvements