Fix problems from Om 1.6.x