Fixes improvements (15/32)

Fixes improvements