Fixes to the debian builds... still not 100% right though.