uuid fix and robustness