Fixing breakage from the merge