diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp
index 05299d482b..b7bdba94a1 100644
--- a/pandatool/src/bam/Sources.pp
+++ b/pandatool/src/bam/Sources.pp
@@ -5,7 +5,7 @@
   #define OTHER_LIBS \
     cull:c loader:c egg:c sgraphutil:c sgattrib:c \
     sgraph:c pnmimagetypes:c \
-    graph:c putil:c express:c panda:m pandaexpress:m \
+    graph:c putil:c linmath:c express:c panda:m pandaexpress:m \
     interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
@@ -22,8 +22,9 @@
   #define LOCAL_LIBS \
     eggbase progbase
   #define OTHER_LIBS \
-    sgmanip:c loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
-    chan:c graph:c putil:c \
+    sgmanip:c cull:c sgattrib:c sgraph:c dgraph:c \
+    loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
+    chan:c graph:c putil:c linmath:c \
     express:c pandaegg:m panda:m pandaexpress:m \
     interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
diff --git a/pandatool/src/egg-palettize/textureImage.cxx b/pandatool/src/egg-palettize/textureImage.cxx
index 8b17c0bb94..c10fbafd4a 100644
--- a/pandatool/src/egg-palettize/textureImage.cxx
+++ b/pandatool/src/egg-palettize/textureImage.cxx
@@ -456,7 +456,7 @@ get_preferred_source() {
   }
 
   SourceTextureImage *best = (SourceTextureImage *)NULL;
-  int best_size;
+  int best_size = 0;
 
   for (si = _sources.begin(); si != _sources.end() && !any_referenced; ++si) {
     SourceTextureImage *source = (*si).second;