Fixing breakage from merge