Fixes for meeting 6.