Minor build warning fixes