Cleaning up a few straggling errors from API change.