Part 6 Fixes