Some more warning fixes.