Fixes improvements (6/32)

Fixes improvements