Fixes improvements (2/32)

Fixes improvements