A few minor fixes to the vimeo workaround