Final updates before 1.2.2