Fix uid parsing