Fix up mounting

Change-Id: I4563e77758f23334966485f545b949b47a26bafb