Some fixes to YTInfo, and URLExpander