Fix mount issues