Fixes for debian build