Bug Fixes

6 Bugs and 0 enhancement requests were closed