Maintenance on hdc/zapat15, hdc/zapat40