Bug Fixes

14 Bugs and 0 enhancement requests were closed