Modifying build order a tad