Other minor fixes.