Fix more incompatibilities
0.4.2