Fix problems in 0.07