Some fixes for debian/rpm packages