Fixes improvements (14/32)

Fixes improvements