diff --git a/bin/ovpn_genconfig b/bin/ovpn_genconfig
index dfa4555..4e54544 100755
--- a/bin/ovpn_genconfig
+++ b/bin/ovpn_genconfig
@@ -154,6 +154,9 @@ while getopts ":a:e:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
     esac
 done
 
+# Create ccd directory for static routes
+[ ! -d "$OPENVPN/ccd" ] && mkdir -p $OPENVPN/ccd
+
 # if new routes were not defined with -r, use default
 [ ${#TMP_ROUTES[@]} -gt 0 ] && OVPN_ROUTES=("${TMP_ROUTES[@]}")
 
diff --git a/bin/ovpn_initpki b/bin/ovpn_initpki
index 8fd5e2d..c4c6f1d 100755
--- a/bin/ovpn_initpki
+++ b/bin/ovpn_initpki
@@ -24,7 +24,7 @@ easyrsa init-pki
 easyrsa build-ca $nopass
 
 easyrsa gen-dh
-openvpn --genkey --secret $OPENVPN/pki/ta.key
+openvpn --genkey --secret $EASYRSA_PKI/ta.key
 
 # Was nice to autoset, but probably a bad idea in practice, users should
 # have to explicitly specify the common name of their server