Fixes improvements (22/32)

Fixes improvements