More debianization changes