Merge youtube fix from 3.0