Make the build pass again