diff --git a/lib/build.sh b/lib/build.sh
index 43ce2b4..88dc5f9 100755
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -34,7 +34,7 @@ function build_project()
 
   cd "${workspace}"
 
-  dpkg-buildpackage -b -a "${TARGET_ARCH}" 2> >(stderr) 1> >(stdout)
+  dpkg-buildpackage -b -a"${TARGET_ARCH}" 2> >(stderr) 1> >(stdout)
 
   if [ $? != 0 ]; then
     fatal "The build process has not completed successfuly !"
diff --git a/package b/package
index 4206a5e..6e89b3b 100755
--- a/package
+++ b/package
@@ -102,6 +102,11 @@ function main {
   # Target architecture
   docker_opt="${docker_opt} -e TARGET_ARCH=${TARGET_ARCH}"
 
+  # If running in terminal, set docker to interactive
+  if [[ -t 1 ]]; then
+    docker_opt="${docker_opt} -it"
+  fi
+
   if [[ ${PERSIST_CONTAINER} -eq 0 ]]
   then
     docker_opt="${docker_opt} --rm "
@@ -163,7 +168,7 @@ done
 [[ -z ${TARGET_ARCH} ]] && TARGET_ARCH=amd64
 
 if [[ "${TARGET_ARCH}" =~ ^i[0-9]86$ ]] && [ -z "${BASE_IMAGE}" ]; then
-  info "32bit architecture specified and no specific image given, switching to 32bit image..."
+  info "32bit architecture specified and no specific image given, switching to default 32bit image..."
   BASE_IMAGE=${DEFAULT_32_IMAGE}
 fi