Fixes improvements (5/32)

Fixes improvements