Several minor consistency improvements.
Merge pull request #317 from oliverschmidt/master

Several minor consistency improvements.