Fixe a couple of little bugs.