Maintenance on hdc/zapat87