Tweak for build order