minor Design fixes