Bug Fixes

No enhancement requests and 5 bugs were closed