Fix yard errors