Repair minor bugs.