Fix up some cookie issues