fixes for test build