Bug fixes stemming from meeting.