Carried over fixes from 201402 repo