Changes needed for using older version.