Fixes from 03/07/14 video conference