Make cafebabe 2.10 compatible