Merge fixes up to 1.2.1