Fix some small recording issues