Bug Fixes complete