Updating: some minor fixes.