Various small bugfixes, Daniel.
6 files changed