compability fixes for latest drg