Bug Fixes Part 2