Fixed composer issues