Catch up with recent changes for 0.8