Various fixes to make the stand-alone player functionality work again.