Finishing Merge Updates

Finished up minor changes for merge.