WSO2 WSF/C++ with additional fixes