Various fixes after rebuild of package for OpenSuse.