diff --git a/se/sics/mspsim/core/Flash.java b/se/sics/mspsim/core/Flash.java
index 582e4b3..ea3661a 100644
--- a/se/sics/mspsim/core/Flash.java
+++ b/se/sics/mspsim/core/Flash.java
@@ -194,7 +194,6 @@ public class Flash extends IOUnit {
 		super("Flash", "Internal Flash", cpu, memory, offset);
 		this.main_range = main_range;
 		this.info_range = info_range;
-		locked = true;
 
 		Arrays.fill(memory, main_range.start, main_range.end, 0xff);
 		Arrays.fill(memory, info_range.start, info_range.end, 0xff);
diff --git a/se/sics/mspsim/core/Watchdog.java b/se/sics/mspsim/core/Watchdog.java
index 296790b..e4fb195 100644
--- a/se/sics/mspsim/core/Watchdog.java
+++ b/se/sics/mspsim/core/Watchdog.java
@@ -112,6 +112,8 @@ public class Watchdog extends IOUnit implements SFRModule {
   public void reset(int type) {
       super.reset(type);
       wdtctl = 0x4;
+      delay=DELAY[wdtctl & WDTISx];
+      scheduleTimer();
   }
 
   private void triggerWDT(long time) {