diff --git a/docker/execute b/docker/execute
index 647dbfb..f4dd47a 100755
--- a/docker/execute
+++ b/docker/execute
@@ -59,6 +59,6 @@ docker run \
     piston \
     runuser \
         -l runner \
-        -c "/$bin /$file $file | head -c 65536 2>&1"
+        -c "/$bin /$file $file 2>&1 | head -c 65536"
 
 rm -f /tmp/$file
diff --git a/docker/executors/cpp b/docker/executors/cpp
index 6097145..2961023 100755
--- a/docker/executors/cpp
+++ b/docker/executors/cpp
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-g++ -o binary -x c $1
+g++ -o binary -x c++ $1
 timeout -s KILL 3 ./binary