Still fixing some composer mishaps