More minor warning fixes