Some minor fixes.