Fixes improvements (3/32)

Fixes improvements