Fixes for new API