Fix small mistakes; v2.1.2.