Fix composer issues #2