Caught up with API changes.

Time for 0.7