Fixes improvements (27/32)

Fixes improvements