Bug Fixes After Testing