Tweak to dependency ordering