mount & unmount workarounds and other fixes