Autoplay fixes