fix issue with uuids being re-used but discarded, update logging