Bug Fixes from testing