Fixed unmounting issues