User fix up before rebuilding entirely