more fixes for debian build