- Fixes for midterm