bring in old fixes previously committed in master