Build error fixes