Fix mount points

Change-Id: I294bb625bf1cac67a1d0d2ff02a6add76f8767d8