Amy's fixes from 2014-010-28