Updated to run with libefp 1.2.0