Some critical bug fixes in cookies investigation