Bug fixes related to remove sared home directories