Make the build pass