More fixes to the slideshow handling