Ve 655 source mode diffs

Tweaked a few things to make the source mode work again after the upstream merge.  Everything seems to be working fine after substituting old methods for new ones.