Rework the build a bit