Changed the build order so the CI build works