Fix generic build (dynamic_generic_fix.diff)