Refs #9213. Attempt to fix build errors/warnings