diff --git a/src/network/packets/Packet.java b/src/network/packets/Packet.java
index de6effe6e..af0742e69 100644
--- a/src/network/packets/Packet.java
+++ b/src/network/packets/Packet.java
@@ -123,7 +123,7 @@ public class Packet {
 	
 	public static void addArray(ByteBuffer bb, byte [] b) {
 		addShort(bb, b.length);
-		bb.order(ByteOrder.LITTLE_ENDIAN).put(b);
+		bb.put(b);
 	}
 
 	public static boolean getBoolean(ByteBuffer bb) {
diff --git a/src/network/packets/swg/zone/chat/ChatPersistentMessageToServer.java b/src/network/packets/swg/zone/chat/ChatPersistentMessageToServer.java
index ebdd82951..c5287e046 100644
--- a/src/network/packets/swg/zone/chat/ChatPersistentMessageToServer.java
+++ b/src/network/packets/swg/zone/chat/ChatPersistentMessageToServer.java
@@ -70,7 +70,7 @@ public class ChatPersistentMessageToServer extends SWGPacket {
 		int dataLength = 31 + message.length()*2+oob.length+subject.length()*2+galaxy.length()+recipient.length();
 		ByteBuffer data = ByteBuffer.allocate(dataLength);
 		addUnicode(data, message);
-		data.order(ByteOrder.LITTLE_ENDIAN).put(oob);
+		data.put(oob);
 		addInt(data, counter);
 		addUnicode(data, subject);
 		addAscii(data, "SWG");
diff --git a/src/resources/commands/callbacks/WaypointCmdCallback.java b/src/resources/commands/callbacks/WaypointCmdCallback.java
index 6bbe7a330..a3304c1ed 100644
--- a/src/resources/commands/callbacks/WaypointCmdCallback.java
+++ b/src/resources/commands/callbacks/WaypointCmdCallback.java
@@ -146,29 +146,20 @@ public class WaypointCmdCallback implements ICmdCallback {
 		if (!Float.isNaN(z))
 			location.setZ(z);
 
-		boolean differentPlanetMessage = false;
 		if (terrain != null) {
 			if (terrain != location.getTerrain()) {
 				location.setTerrain(terrain);
-				differentPlanetMessage = true;
 			}
 		}
 
 		if (name == null)
 			name = "Waypoint";
 
+		if (Float.isNaN(x) || Float.isNaN(z))
+			return;
+
 		WaypointObject waypoint = createWaypoint(galacticManager.getObjectManager(), color, name, location);
 		ghost.addWaypoint(waypoint);
-
-		if (differentPlanetMessage) {
-			new ChatBroadcastIntent(player, "Waypoint: New waypoint \""+ name + "\" created for location "
-					+ terrain.getName() + " (" + String.format("%.0f", location.getX()) + ", "
-					+ String.format("%.0f", location.getY()) + ", "+ String.format("%.0f", location.getZ()) + ")").broadcast();
-		} else {
-			new ChatBroadcastIntent(player, "Waypoint: New waypoint \""+ name + "\" created for location ("
-					+ String.format("%.0f", location.getX()) + ", "+ String.format("%.0f", location.getY())
-					+ ", "+ String.format("%.0f", location.getZ()) + ")").broadcast();
-		}
 	}
 
 	private WaypointObject createWaypoint(ObjectManager objManager, WaypointColor color, String name, Location location) {
diff --git a/src/resources/encodables/ProsePackage.java b/src/resources/encodables/ProsePackage.java
index b8d53b3cf..898d5b873 100644
--- a/src/resources/encodables/ProsePackage.java
+++ b/src/resources/encodables/ProsePackage.java
@@ -193,9 +193,7 @@ public class ProsePackage implements OutOfBandPackage.OutOfBandData {
 		byte[] targetData = target.encode();
 		byte[] otherData = other.encode();
 
-		int size = 14 + stringData.length + actorData.length + targetData.length + otherData.length;
-
-		ByteBuffer bb = ByteBuffer.allocate(size).order(ByteOrder.LITTLE_ENDIAN);
+		ByteBuffer bb = ByteBuffer.allocate(16 + stringData.length + actorData.length + targetData.length + otherData.length).order(ByteOrder.LITTLE_ENDIAN);
 		bb.putShort((short) 0); // ??
 		bb.put(OutOfBandPackage.Type.PROSE_PACKAGE.getType());
 		bb.putInt(-1); // ??