Bug Fixes Part 1