fix misc breakage from plugin safe/rebuild data addition