Fix split mount unmount functions bugs, need testing