diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 2ad813ab95dc71d142753740f7b5eaf4fa21ba4d..cbc2e4109915a72c2d88d7021d8d3bc1fbf1b17b 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -407,7 +407,9 @@ int ll_direct_IO(int rw, struct inode * inode, struct kiobuf * iobuf, unsigned l
 struct address_space_operations ll_aops = {
         readpage: ll_readpage,
         writepage: ll_writepage,
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,17))
         direct_IO: ll_direct_IO,
+#endif
         sync_page: block_sync_page,
         prepare_write: ll_prepare_write, 
         commit_write: ll_commit_write,
diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index f8eee9081467ed7919ef8019e23cfafe3b9dc302..9843989222219b9ce7844ceae37e5889a59e9e94 100644
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -142,6 +142,10 @@ setup_portals() {
 		exit -1
 	fi
 
+	if [ -z "$OSTNODE" ]; then 
+	        OSTNODE=$SERVER
+        fi 
+
 	if [ "$LOCALHOST" == "$SERVER" ]; then
 		DLM=localhost
 	else
@@ -169,6 +173,7 @@ setup_portals() {
 	connect $SERVER $PORT
 	add_uuid self
 	add_uuid mds
+	connect $OSTNODE $PORT
 	add_uuid ost
 	connect $DLM $PORT
 	add_uuid ldlm
diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index bb95d45dddc437ff9e67c4a767f65a1223d26201..b9ce682c1fe81d06c8f8d862dd6b76caea1d35ca 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -64,3 +64,4 @@ rmmod portals
 losetup -d ${LOOP}0
 losetup -d ${LOOP}1
 losetup -d ${LOOP}2
+exit 0
diff --git a/lustre/utils/ha_assist2.sh b/lustre/utils/ha_assist2.sh
index 5cf61b211929c80364b3b1cd1c1423117c1214d9..4a674346c4afc5fbaa70c45f3f13fdfdd301f9ad 100755
--- a/lustre/utils/ha_assist2.sh
+++ b/lustre/utils/ha_assist2.sh
@@ -19,7 +19,7 @@ echo "- please supply a new mds"
 setup tcp
 close_uuid mds
 del_uuid mds
-connect localhost 1234
+connect dev5 1234
 add_uuid mds
 quit
 EOF3