Fixing breakage from merge and new BeefCore