more mount fixups

Change-Id: I4793221af9b9f03e05842593a038600e1076bd2b