Bug Fixes Commit