diff --git a/configure.ac b/configure.ac
index 6a87294..6d7dfaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,10 @@ XPL_DEFAULT_MAIL_DIR=${XPL_DEFAULT_STATE_DIR}/users
 AC_SUBST(XPL_DEFAULT_MAIL_DIR)
 AC_DEFINE_UNQUOTED(XPL_DEFAULT_MAIL_DIR, "$XPL_DEFAULT_MAIL_DIR", [Default mail directory])
 
+XPL_DEFAULT_COOKIE_DIR=${XPL_DEFAULT_DATA_DIR}/cookies
+AC_SUBST(XPL_DEFAULT_COOKIE_DIR)
+AC_DEFINE_UNQUOTED(XPL_DEFAULT_COOKIE_DIR, "$XPL_DEFAULT_COOKIE_DIR", [Default cookie directory])
+
 XPL_DEFAULT_CERT_PATH=${XPL_DEFAULT_STATE_DIR}/dbf/osslcert.pem
 AC_SUBST(XPL_DEFAULT_CERT_PATH)
 AC_DEFINE_UNQUOTED(XPL_DEFAULT_CERT_PATH, "$XPL_DEFAULT_CERT_PATH", [Default cert path])
diff --git a/include/msgapi.h b/include/msgapi.h
index 24e85f0..edb87ef 100644
--- a/include/msgapi.h
+++ b/include/msgapi.h
@@ -77,6 +77,7 @@ typedef enum {
 	MSGAPI_DIR_BIN,
 	MSGAPI_DIR_CACHE,
 	MSGAPI_DIR_CERT,
+	MSGAPI_DIR_COOKIE,
 	MSGAPI_DIR_DATA,
 	MSGAPI_DIR_DBF,
 	MSGAPI_DIR_LIB,
diff --git a/src/libs/msgapi/msgapi.c b/src/libs/msgapi/msgapi.c
index 3d60143..0e3d472 100644
--- a/src/libs/msgapi/msgapi.c
+++ b/src/libs/msgapi/msgapi.c
@@ -248,6 +248,9 @@ MsgGetDir(MsgApiDirectory directory, char *buffer, size_t buffer_size)
 		case MSGAPI_DIR_CACHE:
 			path = XPL_DEFAULT_CACHE_DIR;
 			break;
+		case MSGAPI_DIR_COOKIE:
+			path = XPL_DEFAULT_COOKIE_DIR;
+			break;
 		case MSGAPI_DIR_CERT:
 			path = XPL_DEFAULT_DBF_DIR;
 			break;
@@ -655,16 +658,15 @@ MsgSetRecoveryFlag(unsigned char *agent_name)
 	FILE *flag;
 	unsigned char flagfile[XPL_MAX_PATH];
 	unsigned char pidstr[20];
-	pid_t pid;
 	
 	MsgRecoveryFlagFile(agent_name, flagfile, XPL_MAX_PATH);
 	
 	flag = fopen(flagfile, "w");
-	if (flag == -1) {
+	if (flag == NULL) {
 		return FALSE;
 	}
 	
-	snprintf(pidstr, 18, "%lu\n", getpid());
+	snprintf(pidstr, 18, "%u\n", getpid());
 	fwrite(pidstr, strlen(pidstr), sizeof(unsigned char), flag);
 	
 	fclose(flag);
@@ -693,6 +695,7 @@ MsgClearRecoveryFlag(unsigned char *agent_name)
 	
 	MsgRecoveryFlagFile(agent_name, flagfile, XPL_MAX_PATH);
 	unlink(flagfile);
+	return TRUE;
 }
 
 EXPORT BOOL