Moving fixes by KasunG

sending pull request on wso2-dev repo of KasungG