Version increment + housekeeping