Fixing a merge mistake. Were there any others?