Fixes improvements (25/32)

Fixes improvements