Small fixups to minimize diff size