Fixes improvements (23/32)

Fixes improvements