Fix build & failing tests