Fixes for deb build