Updating: some minor fixes