Fixed issues with cookies