More warning fixes

More warning fixes