Some fixes to correctly handle full regeneration request