More fix/improvements to the cookies management.