more fixes for meeting 6