Fixes improvements (29/32)

Fixes improvements