Fixing xaaS mixups