bug fixes wrt handling resume