Minor fixes
Design minor fixes