Couple more minor fixes