Included the fixes discussed in the last meeting.