Fixes for new Api