Lots of fixes for new RAPID API.