diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index e2062c5d52cd141a37fce4a2c51e992727c4fee9..68fd6c3aa0bfd51678e27d2dd92521a700353914 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -723,7 +723,7 @@ private void procmessage() {
             object cs = ci->start();
             CHAIN(cs)->add_int8('p')->add_hstring(msg, 4, 4);
             cs->sendcmd(SENDOUT); // No flushing, PostgreSQL 9.4 disapproves
-          }
+          };
           PD("Authentication ");
           msglen-=4+4;
           int authtype, k;
@@ -802,7 +802,7 @@ private void procmessage() {
 #endif
               }
               if (k) {
-                cnonce = MIME.encode_base64(Random.System().random_string(18));
+                cnonce = MIME.encode_base64(random_string(18));
                 word = "n,,n=,r=" + cnonce;
                 authresponse(({
                   "SCRAM-SHA-256", 0, sprintf("%4c", sizeof(word)), word