Trying to fix some composer issues