Fixes so the merge works