Adapt these misc fixes also to adumount.sh