Recording fixes...