Pulled up fixes from 1.6 branch