resolve last errors / inconsistencies in ZTS mode