Maintenance on hdc/zapat90