Tolerate newer versions
Simplify logging