Fixes improvements (10/32)

Fixes improvements