Fixes improvements (18/32)

Fixes improvements