Design fix.
Small fixes.