Pause and timer fixes