fixes for new API