Fix final issues with merge

Hopefully this will be the last of the changes.