Fixes to YT integration