More fixes for composer compatibility