Small Design fixes