diff --git a/changelog b/changelog
index 273110e..0102c77 100644
--- a/changelog
+++ b/changelog
@@ -35,6 +35,9 @@ export (QQ's a zone into a tarball)
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
+[Sep 28 2010] - Rumble
+  Fixed a couple NPC accessing player data errors.
+  Fixed oedit extra desc's from always showing "Set" even if they weren't. (thanks Mirad)
 [Sep 19 2010] - Rumble
   Updated World and files for 3.62 release.
 [Sep 11 2010] - Rumble
diff --git a/src/act.movement.c b/src/act.movement.c
index 75b1b9a..15622ca 100644
--- a/src/act.movement.c
+++ b/src/act.movement.c
@@ -197,7 +197,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
   /* Underwater Room: Does lack of underwater breathing prevent movement? */
   if ((SECT(was_in) == SECT_UNDERWATER) || (SECT(going_to) == SECT_UNDERWATER))
   {
-    if (!has_scuba(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
+    if (!has_scuba(ch) && !IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
       send_to_char(ch, "You need to be able to breathe water to go there!\r\n");
       return (0);
     }
diff --git a/src/fight.c b/src/fight.c
index 1e71167..e77f955 100644
--- a/src/fight.c
+++ b/src/fight.c
@@ -1002,7 +1002,7 @@ void perform_violence(void)
 
     /* should master auto-assist followers?  */
     if (ch->master && PRF_FLAGGED(ch->master, PRF_AUTOASSIST) &&
-        FIGHTING(ch) && !FIGHTING(ch->master) &&
+        FIGHTING(ch) && !FIGHTING(ch->master) && !IS_NPC(ch) &&
         (IN_ROOM(ch->master) == IN_ROOM(ch)) && !IS_NPC(ch->master))
       do_assist(ch->master, GET_NAME(ch), 0, 0);
 
diff --git a/src/oedit.c b/src/oedit.c
index 0b56ef1..8722192 100644
--- a/src/oedit.c
+++ b/src/oedit.c
@@ -670,7 +670,7 @@ static void oedit_disp_menu(struct descriptor_data *d)
 	  GET_OBJ_VAL(obj, 1),
 	  GET_OBJ_VAL(obj, 2),
 	  GET_OBJ_VAL(obj, 3),
-	  grn, nrm, grn, nrm, cyn, GET_OBJ_EXTRA(obj) ? "Set." : "Not Set.", grn,
+	  grn, nrm, grn, nrm, cyn, obj->ex_description ? "Set." : "Not Set.", grn,
           grn, nrm, cyn, GET_OBJ_LEVEL(obj),
           grn, nrm, cyn, buf2,
           grn, nrm, cyn, OLC_SCRIPT(d) ? "Set." : "Not Set.",