More fixes after youtubes changes

More changes to fix since the last commit.