diff --git a/sit b/sit
index e424841..9216501 100755
--- a/sit
+++ b/sit
@@ -155,7 +155,7 @@ fi
 
 if [ ! -z "${COMPILER}" ] ; then
     # reevaluate compiler version
-    COMPILER_VERSION=$(eval "$COMPILER_VERSION_CMD")
+    COMPILER_VERSION_FULL=$(eval "$COMPILER_VERSION_CMD")
 fi
 # make the compiler variables CC, CXX, FC and F77 available
 if [ ! -z "$COMPILER_OPTS" ] ; then
@@ -163,12 +163,12 @@ if [ ! -z "$COMPILER_OPTS" ] ; then
     export ${COMPILER_OPTS}
 fi
 if [ ! -z $COMPILER ] ; then
-    echo "Using compiler: $COMPILER version: $COMPILER_VERSION"
+    echo "Using compiler: $COMPILER version: $COMPILER_VERSION_FULL"
 fi
 
 
 if [ ! -z "$MPI" ] ; then
-    MPI_MODULE="mpi/$MPI"
+    MPI_MODULE="$MPI"
     sit_info_verbose "MPI: $MPI"
     sit_info_verbose "MPI version: $MPI_VERSION"
     if [ ! -z "$MPI_VERSION" ] ; then
@@ -182,6 +182,18 @@ if [ ! -z "$MPI" ] ; then
                 ;;
         esac
     fi
+    case $PLATFORM in
+	vulcan)
+            MPI_MODULE="mpi/$MPI"
+	    ;;
+	hawk)
+	    MPI_MODULE="$MPI"
+	    ;;
+	*)
+            sit_error "mpi not supported on this platform"
+	    ;;
+    esac
+
     echo "Loading MPI module ${MPI_MODULE}"
     module load $MPI_MODULE