Latest warning fixes