diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
index 578a348e3..82509a643 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -47,7 +47,7 @@ import net.i2p.util.SecureDirectory;
 public class Daemon {
     public static final String VERSION = "2.0.4";
     private static final Daemon _instance = new Daemon();
-    private boolean _running;
+    private volatile boolean _running;
     private static final boolean DEBUG = false;
     
     /**
diff --git a/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java b/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java
index 4b88e0f0b..63556cc79 100644
--- a/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java
+++ b/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java
@@ -58,10 +58,10 @@ public abstract class BasePRNGStandalone implements IRandomStandalone {
    protected final String name;
 
    /** Indicate if this instance has already been initialised or not. */
-   protected boolean initialised;
+   protected volatile boolean initialised;
 
    /** A temporary buffer to serve random bytes. */
-   protected byte[] buffer;
+   protected volatile byte[] buffer;
 
    /** The index into buffer of where the next byte will come from. */
    protected int ndx;