Composer compatibility improvements