Correct multiple tiny bugs.