Misc fixes for vimeo