Fixed the seperation of checkout and build