Fix mount points to be inline with Jellybean standard