Fix up for 0.8.0