Further warning fixes