A few minor bugs.