XZ and unitcheck related improvements.