Some fixes related to play/pause