Fixups and simplifications for ubuntu/debian.