Composer compatibility fixes