Misc build error fixes.