diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9386aa16..2148c8e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,16 +36,16 @@ jobs:
       - name: Test on Unix
         if: runner.os != 'Windows'
         run: |
+          unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip
+          openicf/bin/ConnectorServer.sh
           if [ "$RUNNER_OS" == "Linux" ]; then
               sudo apt-get install jsvc
+              openicf/bin/openicf.sh start
+              openicf/bin/openicf.sh stop
+              rm -rf openicf/logs
           else
               brew install coreutils jsvc 
           fi
-          unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip
-          openicf/bin/ConnectorServer.sh
-          openicf/bin/openicf.sh start
-          openicf/bin/openicf.sh stop
-          rm -rf openicf/logs
           openicf/bin/ConnectorServer.sh /run &
           timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done'
           ! grep " ERROR " openicf/logs/ConnectorServer.log
diff --git a/OpenICF-java-framework/bundles-parent/pom.xml b/OpenICF-java-framework/bundles-parent/pom.xml
index 0b83fe17..93ea6652 100644
--- a/OpenICF-java-framework/bundles-parent/pom.xml
+++ b/OpenICF-java-framework/bundles-parent/pom.xml
@@ -181,7 +181,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <configuration>
                         <links>
-                            <link>https://docs.groovy-lang.org/latest/html/api/</link>
+                            <!--link>https://docs.groovy-lang.org/latest/html/api/</link-->
 <!--                            <link>http://openicf.forgerock.org/apidocs/</link>-->
                         </links>
                     </configuration>
@@ -328,7 +328,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <links>
-                        <link>https://docs.groovy-lang.org/latest/html/api/</link>
+                        <!--link>https://docs.groovy-lang.org/latest/html/api/</link-->
                     </links>
                 </configuration>
             </plugin>
diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh
index fd3c6449..61f493c9 100644
--- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh
+++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh
@@ -89,7 +89,7 @@ case "$1" in
     start)
         echo "Starting the $DESC..."
         # Start the service
-        jsvc_exec
+        jsvc_exec "-wait 120"
 
         echo "The $DESC has started. pid=$(cat $PID)"
     ;;
@@ -110,7 +110,7 @@ case "$1" in
             jsvc_exec "-stop"
 
             # Start the service
-            jsvc_exec
+            jsvc_exec "-wait 120"
 
             echo "The $DESC has restarted. pid=$(cat $PID)"
         else
diff --git a/OpenICF-java-framework/pom.xml b/OpenICF-java-framework/pom.xml
index 8ed4af2e..9905f569 100644
--- a/OpenICF-java-framework/pom.xml
+++ b/OpenICF-java-framework/pom.xml
@@ -153,7 +153,7 @@
                         <source>${maven.compiler.source}</source>
                         <show>public</show>
                         <links>
-                            <link>https://docs.groovy-lang.org/latest/html/api/</link>
+                            <!--link>https://docs.groovy-lang.org/latest/html/api/</link-->
                         </links>
                     </configuration>
                     <executions>