diff --git a/init.sh b/init.sh
index 94b3b4a..7bce514 100755
--- a/init.sh
+++ b/init.sh
@@ -9,7 +9,7 @@ OPTIND=1
 DEBIAN_VERSION="8.6.0"
 DEBIAN_ARCH="amd64"
 BOOT_TYPE="efi64"
-SYSLINUX_EXE=`witch syslinux`
+SYSLINUX_EXE=`which syslinux`
 SYSLINUX_FILES="menu.c32 vesamenu.c32 libutil.c32 libcom32.c32"
 SYSLINUX_BIOS_FILES=""
 SYSLINUX_EFI_FILES="ldlinux.e64"
@@ -18,7 +18,7 @@ MOUNT_DIR="/mnt/usbstick"
 
 bootfiles_Debian="http://ftp.debian.org/debian/dists/jessie/main/installer-${DEBIAN_ARCH}/current/images/hd-media"
 iso_url="http://cdimage.debian.org/debian-cd/${DEBIAN_VERSION}/${DEBIAN_ARCH}/iso-cd"
-iso_file="debian-${DEBIAN_VERSION}-${DEBIAN_ARCH}-netinst.iso "
+iso_file="debian-${DEBIAN_VERSION}-${DEBIAN_ARCH}-netinst.iso"
 syslinux_mod="/usr/lib/syslinux"
 current_dir=`pwd`