Mounting tweaks

Change-Id: I8e229e14007726966272420feebad40a8be1da4f