Housekeeping for release 0.7