More fixes for 0.8.0