Fixes improvements (31/32)

Fixes improvements