Fix various mistakes.