Fixed all composer problems