Adjust some minor bugs.