further build error fixes