Fixed problem with earlier hotfix
Tweaks to video syndication
Misc fixes and tweaks
Misc fixes
Misc fixes
Merged with v9