Fix trivial bugs.