More corrections for when Z_HOME_DIR == 1