Fix the composer issues in develop2 branch