Fix bugs in mount