Some fixes to allow debian packages