fixes to test build