diff --git a/examples/scripts/basic/relay.sh b/examples/scripts/basic/relay.sh
index ee597c73..4b3483eb 100755
--- a/examples/scripts/basic/relay.sh
+++ b/examples/scripts/basic/relay.sh
@@ -23,7 +23,7 @@ fi
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
 export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
 
-PATH="bin:../bin:../../bin:${PATH}" turnserver -v --syslog -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 --no-tls --no-dtls --no-auth $@
+PATH="bin:../bin:../../bin:${PATH}" turnserver -v --syslog -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 3 --min-port=32355 --max-port=65535 --no-tls --no-dtls --no-auth --db="var/db/turndb" $@
 
 
 
diff --git a/examples/scripts/longtermsecure/secure_relay.sh b/examples/scripts/longtermsecure/secure_relay.sh
index 4fd53c88..7bcb5ac1 100755
--- a/examples/scripts/longtermsecure/secure_relay.sh
+++ b/examples/scripts/longtermsecure/secure_relay.sh
@@ -32,4 +32,4 @@ fi
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
 export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/usr/local/lib/:/usr/local/mysql/lib/
 
-PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver --syslog -a -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 10 --min-port=32355 --max-port=65535 --user=ninefingers:youhavetoberealistic --user=gorst:hero -r north.gov --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout -v --cipher-list=ALL $@
+PATH="./bin/:../bin/:../../bin/:${PATH}" turnserver --syslog -a -L 127.0.0.1 -L ::1 -E 127.0.0.1 -E ::1 --max-bps=3000000 -f -m 10 --min-port=32355 --max-port=65535 --user=ninefingers:youhavetoberealistic --user=gorst:hero -r north.gov --cert=turn_server_cert.pem --pkey=turn_server_pkey.pem --log-file=stdout -v --cipher-list=ALL --db="var/db/turndb" $@
diff --git a/src/client/ns_turn_ioaddr.c b/src/client/ns_turn_ioaddr.c
index f86ede17..685b8755 100644
--- a/src/client/ns_turn_ioaddr.c
+++ b/src/client/ns_turn_ioaddr.c
@@ -324,14 +324,14 @@ int make_ioa_addr_from_full_string(const u08bits* saddr, int default_port, ioa_a
 
 	int ret = -1;
 	int port = 0;
-	char* s = strdup((const char*)saddr);
+	char* s = turn_strdup((const char*)saddr);
 	char *sa = get_addr_string_and_port(s,&port);
 	if(sa) {
 		if(port<1)
 			port = default_port;
 		ret = make_ioa_addr((u08bits*)sa,port,addr);
 	}
-	free(s);
+	turn_free(s,strlen(s)+1);
 	return ret;
 }
 
@@ -511,10 +511,10 @@ static size_t msz = 0;
 void ioa_addr_add_mapping(ioa_addr *apub, ioa_addr *apriv)
 {
 	size_t new_size = msz + sizeof(ioa_addr*);
-	public_addrs = (ioa_addr**)realloc(public_addrs, new_size);
-	private_addrs = (ioa_addr**)realloc(private_addrs, new_size);
-	public_addrs[mcount]=(ioa_addr*)malloc(sizeof(ioa_addr));
-	private_addrs[mcount]=(ioa_addr*)malloc(sizeof(ioa_addr));
+	public_addrs = (ioa_addr**)turn_realloc(public_addrs, msz, new_size);
+	private_addrs = (ioa_addr**)turn_realloc(private_addrs, msz, new_size);
+	public_addrs[mcount]=(ioa_addr*)turn_malloc(sizeof(ioa_addr));
+	private_addrs[mcount]=(ioa_addr*)turn_malloc(sizeof(ioa_addr));
 	addr_cpy(public_addrs[mcount],apub);
 	addr_cpy(private_addrs[mcount],apriv);
 	++mcount;