Fixes improvements (26/32)

Fixes improvements