test build fixes