Some fixes to resume