Corrected errors in cookie set and get
merge