More minor fixes

The title says it all. More minor fixes. :-)