Minor compile warning fixes