Tweak for rebuild