Additional minor fixes.