I sent a big patch fixing a lot of these :)