designer fixes

Fixes depends on designer propositions