Minor fixes
Design fixes