Fixed composer include issues