diff --git a/panda/src/shader/shaderTransition.cxx b/panda/src/shader/shaderTransition.cxx
index 0369bc2cb3..93ef242bd2 100644
--- a/panda/src/shader/shaderTransition.cxx
+++ b/panda/src/shader/shaderTransition.cxx
@@ -95,7 +95,6 @@ void ShaderTransition::
 insert(Shader *shader) {
   PT(Shader) sp(shader);
   Shaders::iterator si = _shaders.begin();
-  ShaderOrder::iterator soi;
   int order = -1;
 
   if ((_shader_order == NULL) && (_overrides.find(sp) == _overrides.end()))
diff --git a/pandatool/src/flt/fltRecordWriter.cxx b/pandatool/src/flt/fltRecordWriter.cxx
index bc551fd85f..826def18c0 100644
--- a/pandatool/src/flt/fltRecordWriter.cxx
+++ b/pandatool/src/flt/fltRecordWriter.cxx
@@ -82,7 +82,7 @@ advance() {
   dg.add_be_int16(_opcode);
   dg.add_be_int16(_datagram.get_length() + header_size);
 
-  nassertr(dg.get_length() == header_size, FE_internal);
+  nassertr((int)dg.get_length() == header_size, FE_internal);
 
   _out.write(dg.get_message().data(), dg.get_length());
   if (_out.fail()) {
diff --git a/pandatool/src/flt/fltUnsupportedRecord.cxx b/pandatool/src/flt/fltUnsupportedRecord.cxx
index d1e4d54c22..26e21292d4 100644
--- a/pandatool/src/flt/fltUnsupportedRecord.cxx
+++ b/pandatool/src/flt/fltUnsupportedRecord.cxx
@@ -60,4 +60,5 @@ bool FltUnsupportedRecord::
 build_record(FltRecordWriter &writer) const {
   writer.set_opcode(_opcode);
   writer.set_datagram(_datagram);
+  return true;
 }
diff --git a/pandatool/src/stitchviewer/stitchImageConverter.cxx b/pandatool/src/stitchviewer/stitchImageConverter.cxx
index 56e13c4716..8bc74ce6d3 100644
--- a/pandatool/src/stitchviewer/stitchImageConverter.cxx
+++ b/pandatool/src/stitchviewer/stitchImageConverter.cxx
@@ -64,7 +64,7 @@ void StitchImageConverter::
 create_image_geometry(Image &im) {
   assert(_output_image != NULL);
 
-  double dist = 1.0 + (double)im._index / (double)_images.size();
+  //  double dist = 1.0 + (double)im._index / (double)_images.size();
 #if 0
   int x_verts = _output_image->get_x_verts();
   int y_verts = _output_image->get_y_verts();