Mainly fix for certain videos, like provided by Vevo

Should cover issues reported in #14