Fixes improvements (19/32)

Fixes improvements