diff --git a/Rocksolid_Light/freebsd-install.sh b/Rocksolid_Light/freebsd-install.sh
index c9b4855..251716e 100755
--- a/Rocksolid_Light/freebsd-install.sh
+++ b/Rocksolid_Light/freebsd-install.sh
@@ -5,12 +5,11 @@ spoolpath="/var/spool/rslight"
 configpath="/etc/rslight"
 username="www"
 
-randpw(){ < /dev/urandom tr -dc _A-Z-a-z-0-9{} | head -c${1:-16};echo;}
-site_key=$(randpw)
-anonymous_password=$(randpw)
-local_password=$(randpw)
-admin_password=$(randpw)
-admin_key=$(randpw)
+site_key=$(/usr/bin/openssl rand -base64 48 | cut -c1-16)
+anonymous_password=$(/usr/bin/openssl rand -base64 48 | cut -c1-16)
+local_password=$(/usr/bin/openssl rand -base64 48 | cut -c1-16)
+admin_password=$(/usr/bin/openssl rand -base64 48 | cut -c1-16)
+admin_key=$(/usr/bin/openssl rand -base64 48 | cut -c1-16)
 
 echo
 echo "This is the main installation script for Rocksolid Light"
diff --git a/Rocksolid_Light/rslight/scripts/spoolnews.php b/Rocksolid_Light/rslight/scripts/spoolnews.php
index ac12d20..cef50e2 100755
--- a/Rocksolid_Light/rslight/scripts/spoolnews.php
+++ b/Rocksolid_Light/rslight/scripts/spoolnews.php
@@ -354,10 +354,11 @@ function get_articles($ns, $group) {
       echo "\nRetrieved: ".$group." ".$article."\n";
       file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Wrote to spool: ".$CONFIG['remote_server']." ".$group.":".$article, FILE_APPEND);
       $i++;
-      if($i > $maxarticles_per_run)
-	break;
       $article++;
       $local++; 
+      if($i > $maxarticles_per_run) {
+        break;
+      }
     }
   }
   $article--;