several fixes in mount