More pause/resume/reset fixing