more cookie fixes