Design fixes.