Fixes improvements (32/32)

Fixes improvements