Cookie/uid fix