1.1 Minor fixes

Some more minor fixes.