Fixes improvements (20/32)

Fixes improvements