Rewind fix/cleanup