API call bugfixes for failover