diff --git a/scripts/start-emulator.sh b/scripts/start-emulator.sh
index b49ee06..aed5afb 100644
--- a/scripts/start-emulator.sh
+++ b/scripts/start-emulator.sh
@@ -15,14 +15,15 @@ adb -a -P 5037 server nodaemon &
 
 # Detect ip and forward ADB ports outside to outside interface
 ip=$(ip addr list eth0 | grep "inet " | cut -d' ' -f6 | cut -d/ -f1)
-redir --laddr=$ip --lport=$EMULATOR_CONSOLE_PORT --caddr=127.0.0.1 --cport=$EMULATOR_CONSOLE_PORT &
-redir --laddr=$ip --lport=$ADB_PORT --caddr=127.0.0.1 --cport=$ADB_PORT &
+redir --laddr="$ip" --lport="$EMULATOR_CONSOLE_PORT" --caddr=127.0.0.1 --cport="$EMULATOR_CONSOLE_PORT" &
+redir --laddr="$ip" --lport="$ADB_PORT" --caddr=127.0.0.1 --cport="$ADB_PORT" &
 
 export USER=root
 
 # Creating the Android Virtual Emulator.
 echo "Creating the Android Virtual Emulator ..."
-echo no | avdmanager create avd -n android --abi ${ABI} -k "$PACKAGE_PATH" --device "pixel"
+echo "Using '$PACKAGE_PATH' and '$ABI' for creating the emulator"
+echo no | avdmanager create avd -n android --abi "${ABI}" -k "$PACKAGE_PATH" --device "pixel"
 
 # Asynchronously write updates on the standard output
 # about the state of the boot sequence.