Shorten cookie a bit and other minor tweaks