diff --git a/.travis.yml b/.travis.yml
index 26088946eb..92732bb929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ compiler:
   - clang
 before_script:
   - sudo apt-get install python-dev libpng-dev zlib1g-dev libssl-dev libx11-dev libgl1-mesa-dev libxrandr-dev libxxf86dga-dev libxcursor-dev bison flex libfreetype6-dev libvorbis-dev libjpeg-dev libopenal-dev libode-dev nvidia-cg-toolkit
-script: python makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT
+script: python makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT --installer
 notifications:
   irc:
     channels:
       - "chat.freenode.net#panda3d"
     on_success: change
-    on_failure: change
+    on_failure: always
     use_notice: true
     skip_join: true
diff --git a/panda/src/gobj/shader.cxx b/panda/src/gobj/shader.cxx
index d441238b99..ced776921d 100755
--- a/panda/src/gobj/shader.cxx
+++ b/panda/src/gobj/shader.cxx
@@ -27,10 +27,13 @@ TypeHandle Shader::_type_handle;
 Shader::ShaderTable Shader::_load_table;
 Shader::ShaderTable Shader::_make_table;
 Shader::ShaderCaps Shader::_default_caps;
-CGcontext Shader::_cg_context = 0;
 int Shader::_shaders_generated;
 ShaderUtilization Shader::_shader_utilization = SUT_unspecified;
 
+#ifdef HAVE_CG
+CGcontext Shader::_cg_context = 0;
+#endif
+
 ////////////////////////////////////////////////////////////////////
 //     Function: Shader::cp_report_error
 //       Access: Public
diff --git a/panda/src/putil/typedWritable_ext.cxx b/panda/src/putil/typedWritable_ext.cxx
index 1cf11e0852..80e3ea2d47 100644
--- a/panda/src/putil/typedWritable_ext.cxx
+++ b/panda/src/putil/typedWritable_ext.cxx
@@ -17,7 +17,7 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-extern EXPCL_PANDA_PUTIL Dtool_PyTypedObject Dtool_BamWriter;
+extern Dtool_PyTypedObject Dtool_BamWriter;
 #endif  // CPPPARSER
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/tinydisplay/zgl.h b/panda/src/tinydisplay/zgl.h
index 05aec50ce1..c18cafa8b7 100644
--- a/panda/src/tinydisplay/zgl.h
+++ b/panda/src/tinydisplay/zgl.h
@@ -1,6 +1,8 @@
 #ifndef _tgl_zgl_h_
 #define _tgl_zgl_h_
 
+#include "dtoolbase.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/pandatool/src/progbase/programBase.cxx b/pandatool/src/progbase/programBase.cxx
index e1417b023e..94bcb0e13b 100644
--- a/pandatool/src/progbase/programBase.cxx
+++ b/pandatool/src/progbase/programBase.cxx
@@ -200,7 +200,7 @@ show_text(const string &prefix, int indent_width, string text) {
 void ProgramBase::
 write_man_page(ostream &out) {
   string prog = _program_name.get_basename_wo_extension();
-  out << ".\\\" Automatically generated by " << prog << " -write-bam\n";
+  out << ".\\\" Automatically generated by " << prog << " -write-man\n";
 
   // Format the man page title as the uppercase version of the program name,
   // as per the UNIX manual conventions.