[HUGE-UPDATE] Composer Fixes