Bug Fixes Part 3