Bug Fixes

3 Bugs and 0 enhancement requests were closed