Some minor cleanup after merge