Fix several little mistakes.