Fix various minor mistakes.