Further fixes for 0.7.