Various build error fixes.