Merge pull request #668 from uwescience/profiling-fixes

Profiling fixes