diff --git a/default.bam b/default.bam
index a2bbba0e2..cbe63fed3 100644
--- a/default.bam
+++ b/default.bam
@@ -337,9 +337,9 @@ function build(settings)
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
 		engine, zlib)
 
-	if platform == "macosx" then
-		osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
-	end
+	--if platform == "macosx" then
+	--	osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
+	--end
 
 	-- make targets
 	c = PseudoTarget("client".."_"..settings.config_name, client_exe)
diff --git a/src/game/client/component.hpp b/src/game/client/component.hpp
index 5d14fa5ea..f03165d2d 100644
--- a/src/game/client/component.hpp
+++ b/src/game/client/component.hpp
@@ -10,7 +10,7 @@ class COMPONENT
 protected:
 	GAMECLIENT *client;
 public:
-	~COMPONENT() {}
+	virtual ~COMPONENT() {}
 	
 	virtual void on_statechange(int new_state, int old_state) {};
 	virtual void on_console_init() {};
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 7db92486b..7329240bc 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -34,6 +34,10 @@ GAMECONTROLLER::GAMECONTROLLER()
 	num_spawn_points[2] = 0;
 }
 
+GAMECONTROLLER::~GAMECONTROLLER()
+{
+}
+
 float GAMECONTROLLER::evaluate_spawn_pos(SPAWNEVAL *eval, vec2 pos)
 {
 	float score = 0.0f;
diff --git a/src/game/server/gamecontroller.hpp b/src/game/server/gamecontroller.hpp
index 89a8ad46d..e45968839 100644
--- a/src/game/server/gamecontroller.hpp
+++ b/src/game/server/gamecontroller.hpp
@@ -54,6 +54,7 @@ public:
 	bool is_teamplay() const;
 	
 	GAMECONTROLLER();
+	virtual ~GAMECONTROLLER();
 
 	void do_team_score_wincheck();
 	void do_player_score_wincheck();