UUID support + bug fixes