Further fixes for debian