diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 94e42afbc3d..9a403c95b25 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -69,7 +69,8 @@
 			var/list/logs = list()
 			for(var/obj/item/clothing/under/C in src.tracked)
 				var/log = ""
-				if((C) && (C.has_sensor) && (C.loc) && (C.loc.z == 1) && C.sensor_mode)
+				var/turf/pos = get_turf(C)
+				if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode)
 					if(istype(C.loc, /mob/living/carbon/human))
 
 						var/mob/living/carbon/human/H = C.loc
@@ -85,7 +86,7 @@
 						if(H.wear_id)
 							log += "<tr><td width='40%'>[H.wear_id.name]</td>"
 						else
-							log += "<tr><td width='40%'>Unknown:</td>"
+							log += "<tr><td width='40%'>Unknown</td>"
 
 						switch(C.sensor_mode)
 							if(1)
@@ -94,7 +95,7 @@
 								log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
 							if(3)
 								var/area/player_area = get_area(H)
-								log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([H.x], [H.y])</td></tr>"
+								log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>"
 				logs += log
 			logs = sortList(logs)
 			for(var/log in logs)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index f21f65cb8fc..1d1892601d2 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -115,9 +115,9 @@
 	else
 		if(isliving(src.loc))
 			return
-		src.pickup(user)
 		user.lastDblClick = world.time + 2
 		user.next_move = world.time + 2
+	src.pickup(user)
 	add_fingerprint(user)
 	user.put_in_active_hand(src)
 	return
diff --git a/html/changelog.html b/html/changelog.html
index 215f1d04253..be2963b6d20 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,7 +61,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h2 class="date">03 November 2012</h2>
 	<h3 class="author">Giacom updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="imageadd">Reduced queen healing rate to 5. The maximum health will be enough.</li>
+		<li class="tweak">Reduced queen healing rate to 5. The maximum health will be enough.</li>
+		<li class="tweak">Aliens can now clear hatched eggs by clicking on them.</li>
 	</ul>
 </div>