More warning fixes