Update 2.1.2
Fixed minor issues