Fixes improvements (17/32)

Fixes improvements