fixes from wso2-dev