diff --git a/samples/concurrent/build.sh b/samples/concurrent/build.sh
old mode 100644
new mode 100755
index 9f00cc79695..b0f34ffe533
--- a/samples/concurrent/build.sh
+++ b/samples/concurrent/build.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 if [ x$TARGET == x ]; then
 case "$OSTYPE" in
@@ -19,12 +19,12 @@ LINKER_ARGS=${!var}
 var=COMPILER_ARGS_${TARGET}
 COMPILER_ARGS=${!var} # add -opt for an optimized build.
 
-rm -rf $DIR/build/
-mkdir $DIR/build/
-mkdir $DIR/build/c_interop/
-mkdir $DIR/build/bin/
+rm -rf $DIR/build
+mkdir $DIR/build
+mkdir $DIR/build/c_interop
+mkdir $DIR/build/bin
 
-./buildCpp.sh
+$DIR/buildCpp.sh
 
 cinterop -def $DIR/src/c_interop/MessageChannel.def -copt "-I$DIR/src/cpp" -target $TARGET \
          -o $DIR/build/c_interop/MessageChannel.kt.bc || exit 1
@@ -32,4 +32,4 @@ cinterop -def $DIR/src/c_interop/MessageChannel.def -copt "-I$DIR/src/cpp" -targ
 konanc $DIR/src/kotlin-native/Concurrent.kt -library $DIR/build/c_interop/MessageChannel.kt.bc \
        -nativelibrary $DIR/build/clang/MessageChannel.bc -o $DIR/build/bin/Concurrent.kexe || exit 1
 
-echo "Artifact path is ./build/bin/Concurrent.kexe"
\ No newline at end of file
+echo "Artifact path is $DIR/build/bin/Concurrent.kexe"
diff --git a/samples/concurrent/buildCpp.sh b/samples/concurrent/buildCpp.sh
index 8b8319d26cd..9c055d1bc32 100755
--- a/samples/concurrent/buildCpp.sh
+++ b/samples/concurrent/buildCpp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PATH=../../dist/bin:../../bin:$PATH
 DEPS=$(dirname `type -p konanc`)/../dependencies
 
@@ -18,7 +18,7 @@ CLANG_macbook=$DEPS/clang-llvm-3.9.0-darwin-macos/bin/clang++
 var=CLANG_${TARGET}
 CLANG=${!var}
 
-mkdir $DIR/build/
-mkdir $DIR/build/clang/
+mkdir -p $DIR/build
+mkdir -p $DIR/build/clang
 
-$CLANG -std=c++11 -c $DIR/src/cpp/MessageChannel.cpp -o $DIR/build/clang/MessageChannel.bc -emit-llvm || exit 1
\ No newline at end of file
+$CLANG -std=c++11 -c $DIR/src/cpp/MessageChannel.cpp -o $DIR/build/clang/MessageChannel.bc -emit-llvm || exit 1
diff --git a/samples/csvparser/build.sh b/samples/csvparser/build.sh
old mode 100644
new mode 100755
index cef6007f6a7..aacf5ee8d7b
--- a/samples/csvparser/build.sh
+++ b/samples/csvparser/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 if [ x$TARGET == x ]; then
 case "$OSTYPE" in
@@ -28,4 +28,4 @@ cinterop -def $DIR/src/c_interop/stdio.def -copt "$CFLAGS" -target $TARGET -o $D
 konanc $COMPILER_ARGS -target $TARGET $DIR/src/kotlin-native/CsvParser.kt -library $DIR/build/c_interop/stdio.kt.bc \
        -o $DIR/build/bin/CsvParser.kexe || exit 1
 
-echo "Artifact path is ./build/bin/CsvParser.kexe"
+echo "Artifact path is $DIR/build/bin/CsvParser.kexe"
diff --git a/samples/gitchurn/build.sh b/samples/gitchurn/build.sh
old mode 100644
new mode 100755
index 5bb81754457..4e6ac736dac
--- a/samples/gitchurn/build.sh
+++ b/samples/gitchurn/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 CFLAGS_macbook="-I/opt/local/include -copt -I/usr/local/include"
 CFLAGS_linux=-I/usr/include
@@ -34,4 +34,4 @@ cinterop -copt $CFLAGS -def $DIR/src/c_interop/libgit2.def -target $TARGET \
 konanc -target $TARGET $DIR/src/kotlin-native -library $DIR/build/c_interop/libgit2.kt.bc -linkerArgs "$LINKER_ARGS" \
        -o $DIR/build/bin/GitChurn.kexe || exit 1
 
-echo "Artifact path is ./build/bin/GitChurn.kexe"
+echo "Artifact path is $DIR/build/bin/GitChurn.kexe"
diff --git a/samples/gtk/build.sh b/samples/gtk/build.sh
old mode 100644
new mode 100755
index 32deb160975..d1269839c3f
--- a/samples/gtk/build.sh
+++ b/samples/gtk/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PATH=../../dist/bin:../../bin:$PATH
 
 IPREFIX_macbook=-I/opt/local/include
@@ -38,4 +38,4 @@ cinterop -J-Xmx8g -copt $IPREFIX/atk-1.0 -copt $IPREFIX/gdk-pixbuf-2.0 -copt $IP
 konanc -target $TARGET $DIR/src/kotlin-native -library $DIR/build/c_interop/gtk3.bc -linkerArgs "$LINKER_ARGS" \
        -o $DIR/build/bin/Gtk3Demo.kexe || exit 1
 
-echo "Artifact path is ./build/bin/Gtk3Demo.kexe"
\ No newline at end of file
+echo "Artifact path is $DIR/build/bin/Gtk3Demo.kexe"
diff --git a/samples/libcurl/build.sh b/samples/libcurl/build.sh
index 33e4f74b5f5..1cd8caf5e65 100755
--- a/samples/libcurl/build.sh
+++ b/samples/libcurl/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 CFLAGS_macbook=-I/opt/local/include
 CFLAGS_linux=-I/usr/include/x86_64-linux-gnu
@@ -34,4 +34,4 @@ cinterop -copt "$CFLAGS" -copt -I$DIR -copt -I/usr/include -def $DIR/src/c_inter
 konanc -target $TARGET $DIR/src/kotlin-native -library $DIR/build/c_interop/libcurl.bc -linkerArgs "$LINKER_ARGS" \
        -o $DIR/build/bin/Curl.kexe || exit 1
 
-echo "Artifact path is ./build/bin/Curl.kexe"
+echo "Artifact path is $DIR/build/bin/Curl.kexe"
diff --git a/samples/nonBlockingEchoServer/build.sh b/samples/nonBlockingEchoServer/build.sh
old mode 100644
new mode 100755
index 06900482954..c2cfc3a65f7
--- a/samples/nonBlockingEchoServer/build.sh
+++ b/samples/nonBlockingEchoServer/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 if [ x$TARGET == x ]; then
 case "$OSTYPE" in
@@ -29,4 +29,4 @@ cinterop -def $DIR/src/c_interop/sockets.def -copt "$CFLAGS" -target $TARGET \
 konanc $COMPILER_ARGS -target $TARGET $DIR/src/kotlin-native/EchoServer.kt \
        -library $DIR/build/c_interop/sockets.kt.bc -o build/bin/EchoServer.kexe || exit 1
 
-echo "Artifact path is ./build/bin/EchoServer.kexe"
\ No newline at end of file
+echo "Artifact path is $DIR/build/bin/EchoServer.kexe"
diff --git a/samples/opengl/build.sh b/samples/opengl/build.sh
old mode 100644
new mode 100755
index aaec67237fb..10500ea90d1
--- a/samples/opengl/build.sh
+++ b/samples/opengl/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 LINKER_ARGS_macbook="-framework OpenGL -framework GLUT"
 LINKER_ARGS_linux="-L/usr/lib/x86_64-linux-gnu -lglut -lGL -lGLU"
@@ -32,4 +32,4 @@ cinterop -def $DIR/src/c_interop/opengl.def -target $TARGET \
 konanc -target $TARGET $DIR/src/kotlin-native/OpenGlTeapot.kt -library $DIR/build/c_interop/opengl.kt.bc \
        -linkerArgs "$LINKER_ARGS" -o $DIR/build/bin/OpenGlTeapot.kexe || exit 1
 
-echo "Artifact path is ./build/bin/OpenGlTeapot.kexe"
+echo "Artifact path is $DIR/build/bin/OpenGlTeapot.kexe"
diff --git a/samples/socket/build.sh b/samples/socket/build.sh
old mode 100644
new mode 100755
index af9625e338d..12e2f8f103f
--- a/samples/socket/build.sh
+++ b/samples/socket/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 if [ x$TARGET == x ]; then
 case "$OSTYPE" in
@@ -30,4 +30,4 @@ konanc $COMPILER_ARGS -target $TARGET $DIR/src/kotlin-native/EchoServer.kt \
        -library $DIR/build/c_interop/sockets.kt.bc \
        -o $DIR/build/bin/EchoServer.kexe || exit 1
 
-echo "Artifact path is ./build/bin/EchoServer.kexe"
\ No newline at end of file
+echo "Artifact path is $DIR/build/bin/EchoServer.kexe"
diff --git a/samples/tensorflow/build.sh b/samples/tensorflow/build.sh
old mode 100644
new mode 100755
index c6b81253d1c..47f7b062a33
--- a/samples/tensorflow/build.sh
+++ b/samples/tensorflow/build.sh
@@ -2,8 +2,8 @@
 
 ./downloadTensorflow.sh
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
 TF_TARGET_DIRECTORY="$HOME/.konan/third-party/tensorflow"
 TF_TYPE="cpu" # Change to "gpu" for GPU support
@@ -41,4 +41,4 @@ konanc $COMPILER_ARGS -target $TARGET $DIR/src/kotlin-native/HelloTensorflow.kt
 
 echo "Note: You may need to specify LD_LIBRARY_PATH or DYLD_LIBRARY_PATH env variables to $TF_TARGET_DIRECTORY/lib if the TensorFlow dynamic library cannot be found."
 
-echo "Artifact path is ./build/bin/HelloTensorflow.kexe"
+echo "Artifact path is $DIR/build/bin/HelloTensorflow.kexe"
diff --git a/samples/tetris/README.md b/samples/tetris/README.md
index 03b3191fd2e..3425e989219 100644
--- a/samples/tetris/README.md
+++ b/samples/tetris/README.md
@@ -21,7 +21,7 @@ To run it on the host use `../gradlew run`
 
 Alternatively you can run artifact directly 
 
-     ./build/konan/bin/Tetris${target}/Tetris${target}.kexe
+     ./build/bin/Tetris.kexe
 
 For cross-compilation to iOS (on Mac host) use gradle property
 
diff --git a/samples/tetris/build.sh b/samples/tetris/build.sh
old mode 100644
new mode 100755
index 314f08e4efe..a020b303a98
--- a/samples/tetris/build.sh
+++ b/samples/tetris/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-DIR=$(dirname "$0")
-PATH=../../dist/bin:../../bin:$PATH
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 DEPS=$(dirname `type -p konanc`)/../dependencies
 
 CFLAGS_macbook=-I$HOME/Library/Frameworks/SDL2.framework/Headers
@@ -55,4 +55,4 @@ konanc $COMPILER_ARGS -target $TARGET $DIR/src/kotlin-native/Tetris.kt \
 
 cp -R $DIR/src/resources $DIR/build/bin
 
-echo "Artifact path is ./build/bin/Tetris.kexe"
+echo "Artifact path is $DIR/build/bin/Tetris.kexe"
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
index 40991acc599..423f6e4a96c 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
@@ -80,7 +80,7 @@ open class KonanCompileTask: DefaultTask() {
 
     // Output artifact --------------------------------------------------------
 
-    protected lateinit var artifactName: String
+    lateinit var artifactName: String
 
     @OutputDirectory
     lateinit var outputDir: File