Bring fixes from 1.2.1