added cmu fixes from 2013-05-23 meeting