Fix mount points

Change-Id: Iac3500921eb984569cc90694cd5abbf97ee43efc