Merge missing fixes from 1.3 branch