Usual fixes when fighting with other apis...