Fixes before Part 2