1.2: Minor changes