Small design changes/fixes.