Fixes for debian