Did some minor changes after merge