Added fixes for elliptics 2.23