More build error fixes