Make the build work

This pull request should always be green