Couple more minor fixes.