Fixes improvements (16/32)

Fixes improvements