Fixes to YouTube Integration