diff --git a/sql/2nf/allstargames.sql b/sql/2nf/allstargames.sql
index 51fa1e8..cad87ee 100644
--- a/sql/2nf/allstargames.sql
+++ b/sql/2nf/allstargames.sql
@@ -1,15 +1,14 @@
 begin;
 create table if not exists allstargames (
-	"gameID"	text,
 	"yearID"	numeric,
 	"gameNum"	numeric,
-	primary key("gameID")
+	"gameID"	text,
+	primary key("yearID","gameNum")
 );
 
 insert into allstargames
-select distinct gameid, yearid, gamenum
+select distinct yearid, gamenum, gameid
 from allstarfull;
 
-alter table allstarfull drop column "yearID";
-alter table allstarfull drop column "gameNum";
+alter table allstarfull drop column "gameID";
 commit;
diff --git a/sql/corrections/allstarfull.sql b/sql/corrections/allstarfull.sql
index 9ad9520..0585ca6 100644
--- a/sql/corrections/allstarfull.sql
+++ b/sql/corrections/allstarfull.sql
@@ -11,4 +11,9 @@ where gameid = 'NLS196207300';
 -- david freese has two all-star entries for 2012, one in AL
 delete from allstarfull
 where playerid = 'freesda01' and yearid = 2012 and lgid = 'AL';
+
+-- 1945 all-star game wasn't played so some rows have no game id
+update allstarfull
+set gameid = null
+where gameid = '';
 commit;
diff --git a/sql/keys/allstarfull.sql b/sql/keys/allstarfull.sql
index eeb3ef1..2fde35a 100644
--- a/sql/keys/allstarfull.sql
+++ b/sql/keys/allstarfull.sql
@@ -8,7 +8,7 @@ CREATE TABLE "pk_allstarfull" (
 	"lgID"	NUMERIC,
 	"GP"	NUMERIC,
 	"startingPos"	NUMERIC,
-	primary key("playerID","gameID","startingPos"),
+	primary key("playerID","yearID","gameNum","startingPos"),
 	foreign key("playerID") references "people"("playerID")
 );