Couple more minor warning fixes.