Bunch of Bug Fixes

No version number change.