Fixes for API