Attempt to alter build order so that deps resolve