More fixes for Cytube changes.