Fixes to massive migration + allow deploy wihtout restart