Small Fixes

Commit messages should make the changes apparent.