Misc fixes 

Catching up on several small fixes before cutting new version for a Debian package release.