Fixes before meeting 02