Minor cleanup after merge