Fix composer issues