Fixes from progress meeting.