Debian fixes for some non-repo subscripts