Fixes improvements (30/32)

Fixes improvements