diff --git a/scripts/_00e_ambrosiaeffect.pex b/scripts/_00e_ambrosiaeffect.pex
index c9945d27..168f15cc 100644
Binary files a/scripts/_00e_ambrosiaeffect.pex and b/scripts/_00e_ambrosiaeffect.pex differ
diff --git a/scripts/_00e_arkanistenfieberwohltatscn.pex b/scripts/_00e_arkanistenfieberwohltatscn.pex
index 68f35437..cf4805a1 100644
Binary files a/scripts/_00e_arkanistenfieberwohltatscn.pex and b/scripts/_00e_arkanistenfieberwohltatscn.pex differ
diff --git a/scripts/_00e_fs_dreameatersc.pex b/scripts/_00e_fs_dreameatersc.pex
index 4c757a48..df89bcfc 100644
Binary files a/scripts/_00e_fs_dreameatersc.pex and b/scripts/_00e_fs_dreameatersc.pex differ
diff --git a/scripts/_00e_gui_actorhealthbar.pex b/scripts/_00e_gui_actorhealthbar.pex
index c0e2af76..cc4b60f2 100644
Binary files a/scripts/_00e_gui_actorhealthbar.pex and b/scripts/_00e_gui_actorhealthbar.pex differ
diff --git a/source/scripts/_00e_ambrosiaeffect.psc b/source/scripts/_00e_ambrosiaeffect.psc
index 8f7c4e31..2e191d44 100644
--- a/source/scripts/_00e_ambrosiaeffect.psc
+++ b/source/scripts/_00e_ambrosiaeffect.psc
@@ -5,7 +5,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 	float fMagnitude = - akTarget.GetActorValue("Mood")
 	akTarget.SetActorValue("Mood", 0)
 	
-	if akTarget.GetFormID() != 0x14
+	if akTarget != Game.GetForm(0x14)
 		return
 	endif
 	
diff --git a/source/scripts/_00e_arkanistenfieberwohltatscn.psc b/source/scripts/_00e_arkanistenfieberwohltatscn.psc
index 9569422f..5ffbee84 100644
--- a/source/scripts/_00e_arkanistenfieberwohltatscn.psc
+++ b/source/scripts/_00e_arkanistenfieberwohltatscn.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_ArkanistenfieberWohltatSCN extends activemagiceffect  
 
-Event OnEffectStart(actor akTarget, Actor akCaster)
+Event OnEffectStart(Actor akTarget, Actor akCaster)
 
-	If akTarget.GetFormID() == 0x14
+	If akTarget == Game.GetForm(0x14)
 		akPlayer = akTarget
 		fOldAV = -1*(akPlayer.GetActorValue("LastFlattered"))
 	Else
@@ -28,4 +28,4 @@ float fNewAV
 Actor akPlayer
 ImageSpaceModifier Property _00E_ArkanistenfieberIMOD Auto
 Sound Property _00E_FS_IncreaseArcaneFeverM Auto
-Message Property _00E_Player_sArcaneFeverIncreased Auto
\ No newline at end of file
+Message Property _00E_Player_sArcaneFeverIncreased Auto
diff --git a/source/scripts/_00e_fs_dreameatersc.psc b/source/scripts/_00e_fs_dreameatersc.psc
index 00a14676..7240b72a 100644
--- a/source/scripts/_00e_fs_dreameatersc.psc
+++ b/source/scripts/_00e_fs_dreameatersc.psc
@@ -16,12 +16,12 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster)
 		fMagnitude = akTarget.GetActorValue(sActorValue)
 	endif
 	
+	akTarget.RestoreActorValue(sActorValue, fMagnitude)
+	
 	if akTarget.IsDead()
 		return
 	endif
 	
-	akTarget.RestoreActorValue(sActorValue, fMagnitude)
-	
 	Float fBonusDamage = fMagnitude * akCaster.GetActorValue("Illusion") / 3.0
 	If fBonusDamage < fMagnitude
 		fBonusDamage = fMagnitude
diff --git a/source/scripts/_00e_gui_actorhealthbar.psc b/source/scripts/_00e_gui_actorhealthbar.psc
index 8bf24254..df2cf52d 100644
--- a/source/scripts/_00e_gui_actorhealthbar.psc
+++ b/source/scripts/_00e_gui_actorhealthbar.psc
@@ -126,13 +126,11 @@ event OnGameReload()
 
 	Utility.Wait(FadeOutDuration / 1000.0 + 1.0)
 	
-	Actor PlayerRef = Game.GetForm(0x14) as Actor
-	
 	int i = _currentlyDisplayedActors.Length
 	While i > 0
 		i -= 1
 		Actor akActor = _currentlyDisplayedActors[i] as Actor
-		If !akActor || akActor.GetFormID() == 0 || akActor.IsDeleted() || akActor.IsDisabled()
+		If ! akActor || akActor.GetFormID() == 0 || akActor.IsDeleted() || akActor.IsDisabled() || ! akActor.IsInCombat()
 			_currentlyDisplayedActors[i] = None
 		else
 			AddActorRaw(akActor)