fixes for updated api