Fix build and tests.