Design fixes.
Small fixes.