Fixing up some more issues with preroll