Fixed various issues with playback
This will create a new commit in order to revert the existing changes.
