Work-around incompatibilities between versions