Bug Fixes - Part 1 complete