diff --git a/projects/scripts/adi_env.tcl b/projects/scripts/adi_env.tcl
index e5e15c4ee..1e6ef3183 100644
--- a/projects/scripts/adi_env.tcl
+++ b/projects/scripts/adi_env.tcl
@@ -1,8 +1,9 @@
 
 # environment related stuff
 
-set ad_hdl_dir  "../../.."
-set ad_phdl_dir "../../.."
+set ad_hdl_dir [file normalize [file join [file dirname [info script]] "../.."]]
+set ad_phdl_dir $ad_hdl_dir
+
 
 if [info exists ::env(ADI_HDL_DIR)] {
   set ad_hdl_dir $::env(ADI_HDL_DIR)
diff --git a/projects/scripts/adi_project.tcl b/projects/scripts/adi_project.tcl
index cce18d679..4aba77ace 100644
--- a/projects/scripts/adi_project.tcl
+++ b/projects/scripts/adi_project.tcl
@@ -16,6 +16,10 @@ if {[info exists ::env(ADI_IGNORE_VERSION_CHECK)]} {
   set IGNORE_VERSION_CHECK 0
 }
 
+set p_board "not-applicable"
+set p_device "none"
+set sys_zynq 1
+
 proc adi_project_create {project_name {mode 0}} {
 
   global ad_hdl_dir
@@ -26,10 +30,6 @@ proc adi_project_create {project_name {mode 0}} {
   global REQUIRED_VIVADO_VERSION
   global IGNORE_VERSION_CHECK
 
-  set p_device "none"
-  set p_board "none"
-  set sys_zynq 0
-
   if [regexp "_ac701$" $project_name] {
     set p_device "xc7a200tfbg676-2"
     set p_board "xilinx.com:ac701:part0:1.0"