fixes for rpm/deb build