diff --git a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java
index 148c2467c90d9d632de9c196513c0d2cdacdbbf1..12d6c6bee1d888b4e8a9a205ebf2ddc8963a7215 100644
--- a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java
+++ b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java
@@ -42,8 +42,8 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl
         super();
         _bufferCount = Math.max(context.getProperty("prng.buffers", DEFAULT_BUFFERS), 2);
         _bufferSize = Math.max(context.getProperty("prng.bufferSize", DEFAULT_BUFSIZE), 16*1024);
-        _emptyBuffers = new LinkedBlockingQueue(_bufferCount);
-        _fullBuffers = new LinkedBlockingQueue(_bufferCount);
+        _emptyBuffers = new LinkedBlockingQueue<AsyncBuffer>(_bufferCount);
+        _fullBuffers = new LinkedBlockingQueue<AsyncBuffer>(_bufferCount);
         _context = context;
         context.statManager().createRequiredRateStat("prng.bufferWaitTime", "Delay for random number buffer (ms)", "Encryption", new long[] { 60*1000, 10*60*1000, 60*60*1000 } );
         context.statManager().createRequiredRateStat("prng.bufferFillTime", "Time to fill random number buffer (ms)", "Encryption", new long[] { 60*1000, 10*60*1000, 60*60*1000 } );
@@ -77,7 +77,7 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl
     /** the seed is only propogated once the prng is started with startup() */
     @Override
     public void seed(byte val[]) {
-        Map props = Collections.singletonMap(SEED, val);
+        Map<String, byte[]> props = Collections.singletonMap(SEED, val);
         init(props);
         //fillBlock();
     }
diff --git a/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java b/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java
index 63556cc795cd646a1a4f3407d7ee4b6e9d98bf94..6050917b81c02cf1b148ea8cb1558969b2f90cfb 100644
--- a/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java
+++ b/core/java/src/gnu/crypto/prng/BasePRNGStandalone.java
@@ -91,7 +91,7 @@ public abstract class BasePRNGStandalone implements IRandomStandalone {
       return name;
    }
 
-   public void init(Map attributes) {
+   public void init(Map<String, byte[]> attributes) {
       this.setup(attributes);
 
       ndx = 0;
@@ -179,7 +179,7 @@ public abstract class BasePRNGStandalone implements IRandomStandalone {
     return super.clone();
   }
 
-   public abstract void setup(Map attributes);
+   public abstract void setup(Map<String, byte[]> attributes);
 
    public abstract void fillBlock(); //throws LimitReachedException;
 }
diff --git a/core/java/src/gnu/crypto/prng/FortunaStandalone.java b/core/java/src/gnu/crypto/prng/FortunaStandalone.java
index 8128794daf660bdb3d872136acaab81f97e8d1f3..1cff8d71eb1f2a0486509db5e73e71f88228c97f 100644
--- a/core/java/src/gnu/crypto/prng/FortunaStandalone.java
+++ b/core/java/src/gnu/crypto/prng/FortunaStandalone.java
@@ -131,12 +131,12 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
   }
 
   public void seed(byte val[]) {
-      Map props = Collections.singletonMap(SEED, val);
+      Map<String, byte[]> props = Collections.singletonMap(SEED, val);
       init(props);
       fillBlock();
   }
   
-  public void setup(Map attributes)
+  public void setup(Map<String, byte[]> attributes)
   {
     lastReseed = 0;
     reseedCount = 0;
@@ -312,7 +312,7 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
       incrementCounter();
     }
 
-    public void setup(Map attributes)
+    public void setup(Map<String, byte[]> attributes)
     {
       seeded = false;
       Arrays.fill(key, (byte) 0);
diff --git a/core/java/src/gnu/crypto/prng/IRandomStandalone.java b/core/java/src/gnu/crypto/prng/IRandomStandalone.java
index a7f343378db682decb09d23355cc1eac28f1a7ea..59d8b289bc4fe95f0c7f33149678a617f95dbd8b 100644
--- a/core/java/src/gnu/crypto/prng/IRandomStandalone.java
+++ b/core/java/src/gnu/crypto/prng/IRandomStandalone.java
@@ -107,7 +107,7 @@ public interface IRandomStandalone extends Cloneable {
     * @exception IllegalArgumentException if at least one of the defined name/
     * value pairs contains invalid data.
     */
-   void init(Map attributes);
+   void init(Map<String, byte[]> attributes);
 
    /**
      * <p>Returns the next 8 bits of random data generated from this instance.</p>