fixup after quantal merge

The quantal merge left a couple of precise stuff, this should take care of it.
I hope I catched all of them.