Make the build really work
Make unmounting more solid