Fix misc. bugs with auto rewind