Midterm fixes