carried over fixes from 201402 repo part 2