Fixes from last friday meeting.