Fixes improvements (21/32)

Fixes improvements