diff --git a/Config/Glide64.rdb b/Config/Glide64.rdb
index 42392da3a..a29d95ef7 100644
--- a/Config/Glide64.rdb
+++ b/Config/Glide64.rdb
@@ -2317,6 +2317,7 @@ force_microcheck=1
 Good Name=PD Ultraman Battle Collection 64 (J)
 Internal Name=Ultraman Battle JAPA
 depthmode=0
+fb_smart=0
 
 [E4B08007-A602FF33-C:50]
 Good Name=Perfect Dark (E) (M5)
@@ -3682,24 +3683,28 @@ depthmode=1
 Good Name=Waialae Country Club - True Golf Classics (E) (M4) (V1.0)
 Internal Name=Waialae Country Club
 depthmode=0
+fb_smart=0
 wrap_big_tex=1
 
 [0C5057AD-046E126E-C:50]
 Good Name=Waialae Country Club - True Golf Classics (E) (M4) (V1.1)
 Internal Name=Waialae Country Club
 depthmode=0
+fb_smart=0
 wrap_big_tex=1
 
 [8066D58A-C3DECAC1-C:45]
 Good Name=Waialae Country Club - True Golf Classics (U) (V1.0)
 Internal Name=Waialae Country Club
 depthmode=0
+fb_smart=0
 wrap_big_tex=1
 
 [DD318CE2-B73798BA-C:45]
 Good Name=Waialae Country Club - True Golf Classics (U) (V1.1)
 Internal Name=Waialae Country Club
 depthmode=0
+fb_smart=0
 wrap_big_tex=1
 
 [650EFA96-30DDF9A7-C:50]
diff --git a/Config/Project64.rdb b/Config/Project64.rdb
index 7c7176878..c4d2f377e 100644
--- a/Config/Project64.rdb
+++ b/Config/Project64.rdb
@@ -2187,6 +2187,7 @@ AiCountPerBytes=50
 Good Name=Golden Nugget 64 (U)
 Internal Name=GOLDEN NUGGET 64
 Status=Compatible
+Linking=Off
 
 [0414CA61-2E57B8AA-C:50]
 Good Name=GoldenEye 007 (E)
@@ -6249,12 +6250,24 @@ Internal Name=Toy Story 2
 Status=Compatible
 Counter Factor=1
 
+[BC4F2AB8-AA99E32E-C:44]
+Good Name=Toy Story 2 (G) (V1.1)
+Internal Name=Toy Story 2
+Status=Compatible
+Counter Factor=1
+
 [A150743E-CF2522CD-C:45]
 Good Name=Toy Story 2 (U)
 Internal Name=Toy Story 2
 Status=Compatible
 Counter Factor=1
 
+[C151AD61-280FFF22-C:45]
+Good Name=Toy Story 2 (U) (V1.1)
+Internal Name=Toy Story 2
+Status=Compatible
+Counter Factor=1
+
 [91691C3D-F4AC5B4D-C:4A]
 Good Name=Transformers - Beast Wars Metals 64 (J)
 Internal Name=BEASTWARSMETALS64