Futher build error fixes