Misc minor build warning fixes.