Multiple minor fixes.