Osmosis Fixes

DOC-26