Compile warning fixes