Fixes improvements (28/32)

Fixes improvements