Fix IaaS API issues