Some more minor touch-ups