More warning fixes.