Cookie bugs fixed