More unifying after merge with master