build/test error fixes