More work on debianiztion