Further warning fixes.