diff --git a/editor/editor.cpp b/editor/editor.cpp
index 4c876f8..cdb3301 100644
--- a/editor/editor.cpp
+++ b/editor/editor.cpp
@@ -542,7 +542,7 @@ SOCKET clientConnect(SOCKET serverSocket, sockaddr_in *host)
 	SOCKET clientSocket = accept(serverSocket, (sockaddr*)&hostTemp, &hostSize);
 	if (INVALID_SOCKET == clientSocket) return INVALID_SOCKET;
 
-	const char *expectedGreeting = client_greet;
+	const char *expectedGreeting = CLIENT_GREET;
 	char recievedGreeting[128];
 
 	recv(clientSocket, recievedGreeting, int(strlen(expectedGreeting)), 0);
@@ -553,7 +553,7 @@ SOCKET clientConnect(SOCKET serverSocket, sockaddr_in *host)
 		return INVALID_SOCKET;
 	}
 
-	const char *greeting = server_greet;
+	const char *greeting = SERVER_GREET;
 	send(clientSocket, greeting, int(strlen(greeting)), 0);
 
 	if (NULL != host) *host = hostTemp;
diff --git a/example_bass/example_bass.cpp b/example_bass/example_bass.cpp
index c4f84e2..48420dd 100644
--- a/example_bass/example_bass.cpp
+++ b/example_bass/example_bass.cpp
@@ -168,7 +168,8 @@ int main(int argc, char *argv[])
 		D3DXVECTOR3 at(0, 0, 0);
 		D3DXVECTOR3 up(0, 1, 0);
 		D3DXMATRIX view;
-		D3DXMatrixLookAtLH(&view, &(eye + at), &at, &up);
+		D3DXVECTOR3 dir = eye + at;
+		D3DXMatrixLookAtLH(&view, &dir, &at, &up);
 		dev->SetTransform(D3DTS_VIEW, &view);
 		
 		D3DXMATRIX proj;
diff --git a/sync/base.h b/sync/base.h
index 364d3e5..caf4e4d 100644
--- a/sync/base.h
+++ b/sync/base.h
@@ -26,8 +26,8 @@
  #define closesocket(x) close(x)
 #endif
 
-static const char *client_greet = "hello, synctracker!";
-static const char *server_greet = "hello, demo!";
+#define CLIENT_GREET "hello, synctracker!"
+#define SERVER_GREET "hello, demo!"
 
 enum {
 	SET_KEY = 0,
diff --git a/sync/device.c b/sync/device.c
index b281414..e6318d7 100644
--- a/sync/device.c
+++ b/sync/device.c
@@ -60,11 +60,11 @@ static SOCKET server_connect(const char *host, unsigned short nport)
 	if (sock == INVALID_SOCKET)
 		return INVALID_SOCKET;
 
-	if (xsend(sock, client_greet, strlen(client_greet), 0) ||
-	    xrecv(sock, greet, strlen(server_greet), 0))
+	if (xsend(sock, CLIENT_GREET, strlen(CLIENT_GREET), 0) ||
+	    xrecv(sock, greet, strlen(SERVER_GREET), 0))
 		return INVALID_SOCKET;
 
-	if (!strncmp(server_greet, greet, strlen(server_greet)))
+	if (!strncmp(SERVER_GREET, greet, strlen(SERVER_GREET)))
 		return sock;
 
 	closesocket(sock);
@@ -200,7 +200,7 @@ static int handle_set_key_cmd(SOCKET sock, struct sync_data *data)
 	key.value = v.f;
 
 	assert(type < KEY_TYPE_COUNT);
-	assert(track < (int)data->num_tracks);
+	assert(track < data->num_tracks);
 	key.type = (enum key_type)type;
 	sync_set_key(data->tracks[track], &key);
 	return 1;
@@ -217,7 +217,7 @@ static int handle_del_key_cmd(SOCKET sock, struct sync_data *data)
 	track = ntohl(track);
 	row = ntohl(row);
 
-	assert(track < (int)data->num_tracks);
+	assert(track < data->num_tracks);
 	sync_del_key(data->tracks[track], row);
 	return 1;
 }