Cookie clear fixes