Some warning fixes.