Fixed issues with fitvids
Merge branch 'fixes'