Fix conflicts from 3df223