diff --git a/game/engines/default/modules/boot/dialogs/Credits.lua b/game/engines/default/modules/boot/dialogs/Credits.lua
index 580f333995fd5ebb4190cd49b5f0a8c06f24b04b..a9f0d0b96d6f2b8e54ddc59fc0303dbec2c3b6d9 100644
--- a/game/engines/default/modules/boot/dialogs/Credits.lua
+++ b/game/engines/default/modules/boot/dialogs/Credits.lua
@@ -122,7 +122,7 @@ local credits = {
 	{"Community Managers", title=2},
 	{"Bradley 'AuraOfTheDawn' Kersey"},
 	{"Faeryan"},
-	{"Lord Xandor"},
+	{"Erik 'Lord Xandor' Tillford"},
 	{"Michael 'Dekar' Olscher"},
 	{"Reenen 'Canderel' Laurie"},
 	{"The Revanchist"},
diff --git a/game/modules/tome/data/talents/celestial/glyphs.lua b/game/modules/tome/data/talents/celestial/glyphs.lua
index 06d1748b3c7a2e9f0423640ba19104ea4733dd0c..472fc32972b62c087f83d78d953d3f8520295327 100644
--- a/game/modules/tome/data/talents/celestial/glyphs.lua
+++ b/game/modules/tome/data/talents/celestial/glyphs.lua
@@ -196,7 +196,7 @@ newTalent{
 		local trap = Trap.new{
 			name = "glyph of explosion",
 			type = "elemental", id_by_type=true, unided_name = "trap",
-			display = '^', color=colors.GOLD, image = "trap/trap_glyph_explosion_01_64.png",
+			display = '^', color=colors.GOLD, image = "trap/trap_glyph_explosion_02_64.png",
 			dam = dam,
 			canTrigger = function(self, x, y, who)
 				if who:reactionToward(self.summoner) < 0 then return mod.class.Trap.canTrigger(self, x, y, who) end
diff --git a/src/fov.c b/src/fov.c
index 46831132f2c5ecfad57613ef82932891fa5ffc10..188a6344df35d7864dca8236f07a58aa2b6890c5 100644
--- a/src/fov.c
+++ b/src/fov.c
@@ -648,7 +648,7 @@ static int lua_fov_line_step(lua_State *L)
 
 	fov_line_data *line = &(lua_line->line);
 	bool dont_stop_at_end = lua_toboolean(L, 2);
-	if (!dont_stop_at_end && line->dest_t == line->t || line->dest_t == 0) return 0;
+	if ((!dont_stop_at_end && line->dest_t == line->t) || line->dest_t == 0) return 0;
 
 	bool is_corner_blocked = false;
 	float fx, fy, x0, y0, fx2, fy2, dx, dy;
@@ -1194,7 +1194,7 @@ static int lua_hex_fov_line_step(lua_State *L)
 
 	hex_fov_line_data *line = &(lua_line->line);
 	bool dont_stop_at_end = lua_toboolean(L, 2);
-	if (!dont_stop_at_end && line->dest_t == line->t || line->dest_t == 0) return 0;
+	if ((!dont_stop_at_end && line->dest_t == line->t) || line->dest_t == 0) return 0;
 
 	line->t += 1;
 	float fx = INV_SQRT_3_2 * (line->source_x + (float)line->t * line->step_x + line->eps_x);
diff --git a/src/fov/fov.c b/src/fov/fov.c
index 840a690d9198a4f1d9ac34dd176f6d3ac01abab0..4c7b3d92d044c8c65355bd9a37b297ee46728489 100644
--- a/src/fov/fov.c
+++ b/src/fov/fov.c
@@ -2687,7 +2687,7 @@ void fov_create_los_line(fov_settings_type *settings, void *map, void *source, f
                 }
 
                 /* being "pinched" isn't blocked, because one can still look diagonally */
-                if (mb0 && b1 || b0 && mb1 ||
+                if ((mb0 && b1) || (b0 && mb1) ||
                         gabs * (lower_slope - upper_slope) > GRID_EPSILON ||
                         gy*((float)(sy - ty) + (float)(tx - sx)*lower_slope - gy*0.5f) > -GRID_EPSILON ||
                         gy*((float)(sy - ty) + (float)(tx - sx)*upper_slope + gy*0.5f) <  GRID_EPSILON)
@@ -2808,7 +2808,7 @@ void fov_create_los_line(fov_settings_type *settings, void *map, void *source, f
                 }
 
                 /* being "pinched" isn't blocked, because one can still look diagonally */
-                if (mb0 && b1 || b0 && mb1 ||
+                if ((mb0 && b1) || (b0 && mb1) ||
                         gabs * (lower_slope - upper_slope) > GRID_EPSILON ||
                         gx*((float)(sx - tx) + (float)(ty - sy)*lower_slope - gx*0.5f) > -GRID_EPSILON ||
                         gx*((float)(sx - tx) + (float)(ty - sy)*upper_slope + gx*0.5f) <  GRID_EPSILON)
diff --git a/src/main.c b/src/main.c
index d8d4b81c67a368a03ca7399d27fff83a539fad54..558d1579c99981728561d4f4a88ad1f2995fe655 100644
--- a/src/main.c
+++ b/src/main.c
@@ -350,13 +350,13 @@ void on_event(SDL_Event *event)
 				else if (wc < 0x800)
 				{
 					buf[0] = (0xC0 | wc>>6);
-					buf[1] = (0x80 | wc & 0x3F);
+					buf[1] = (0x80 | (wc & 0x3F));
 				}
 				else
 				{
 					buf[0] = (0xE0 | wc>>12);
-					buf[1] = (0x80 | wc>>6 & 0x3F);
-					buf[2] = (0x80 | wc & 0x3F);
+					buf[1] = (0x80 | (wc>>6 & 0x3F));
+					buf[2] = (0x80 | (wc & 0x3F));
 				}
 
 				lua_pushstring(L, buf);