Merge changs from czietsman (deb package fixes)