Make the build to pass again