1.2: Minor fixes