Another minor fixes.