Fix FwaaS instantiation