Applied latest round (and item missed from prev round) of MikeV fixes
Applied latest round (and item missed from prev round) of MikeV fixes

bloomberg/bde,bloomberg/bde,bloomberg/bde,bloomberg/bde,bloomberg/bde