Changes to make the build succeed