Design fixes 1