Recording fixes