diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 9d881515dd..a5f9d6eb3b 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -10,7 +10,21 @@ namespace ESSImport
     void ActorData::load(ESM::ESMReader &esm)
     {
         if (esm.isNextSub("ACTN"))
+        {
+            /*
+            Activation flags:
+            ActivationFlag_UseEnabled  = 1
+            ActivationFlag_OnActivate  = 2
+            ActivationFlag_OnDeath  = 10h
+            ActivationFlag_OnKnockout  = 20h
+            ActivationFlag_OnMurder  = 40h
+            ActivationFlag_DoorOpening  = 100h
+            ActivationFlag_DoorClosing  = 200h
+            ActivationFlag_DoorJammedOpening  = 400h
+            ActivationFlag_DoorJammedClosing  = 800h
+            */
             esm.skipHSub();
+        }
 
         if (esm.isNextSub("STPR"))
             esm.skipHSub();
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 733fdd132b..e8ac63bf6b 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -158,11 +158,15 @@ namespace MWGui
                     // figure out if player will be woken while sleeping
                     int x = Misc::Rng::rollDice(hoursToWait);
                     float fSleepRandMod = world->getStore().get<ESM::GameSetting>().find("fSleepRandMod")->getFloat();
-                    if (x < static_cast<int>(fSleepRandMod * hoursToWait))
+                    if (x < fSleepRandMod * hoursToWait)
                     {
                         float fSleepRestMod = world->getStore().get<ESM::GameSetting>().find("fSleepRestMod")->getFloat();
-                        mInterruptAt = hoursToWait - int(fSleepRestMod * hoursToWait);
-                        mInterruptCreatureList = region->mSleepList;
+                        int interruptAtHoursRemaining = int(fSleepRestMod * hoursToWait);
+                        if (interruptAtHoursRemaining != 0)
+                        {
+                            mInterruptAt = hoursToWait - interruptAtHoursRemaining;
+                            mInterruptCreatureList = region->mSleepList;
+                        }
                     }
                 }
             }