Housekeeping for porting over to 0.1.6