Merge fixes from 1.2