Stanford incremental updates

* Making newly merged release branch get closer to working