.25 fix RC1

The least invasive but still efficient way found so far that should make
it .25-compatible (+ tiny stuff)