Merging some small changes for running on stampede