Fixes for stable deb build