Changes to support 2.3.1: cookies!