Fix elastigo breaking changes