diff --git a/INSTALL b/INSTALL
index c49361912..7a19238af 100644
--- a/INSTALL
+++ b/INSTALL
@@ -41,7 +41,7 @@ Building
 Once you've installed the required software packages, the simplest way to build mapnik is to run "scons" (The software builder) without any options:
 
 $ cd /path/to/mapnik-sourcecode
-$ /path/to/python scons/scons.py
+$ /path/to/python scons/scons
 
 This should compile and link the mapnik library, the input plugins and the python language binding (if possible).  If any mandatory dependencies are not found the build will fail, and you will need to specify custom paths to your libraries and include files (see below).
 
@@ -135,7 +135,7 @@ This help should be self-explanatory!
 
 For example, if you compiled your own set of Boost libraries, you might use:
 
-$ /path/to/python scons/scons.py BOOST_INCLUDES=/usr/local/include/boost-1_33_1 BOOST_LIBS=/usr/local/lib
+$ /path/to/python scons/scons BOOST_INCLUDES=/usr/local/include/boost-1_33_1 BOOST_LIBS=/usr/local/lib
 
 
 Installation
@@ -143,7 +143,7 @@ Installation
 
 Once the build has successfully completed, you can install the various files on your system by executing:
 
-$ /path/to/python scons/scons.py install
+$ /path/to/python scons/scons install
 
 By default, everything will be installed under the PREFIX '/usr/local' as such:
 
diff --git a/demo/c++/readme.txt b/demo/c++/readme.txt
index 0da76c013..51a660fc4 100644
--- a/demo/c++/readme.txt
+++ b/demo/c++/readme.txt
@@ -2,7 +2,7 @@ This directory contains a simple c++ program demonstrating Mapnik API. It mimics
 
 To build (using GCC/G++ toolkit):
 
-g++ -O3 -I/usr/local/include/mapnik -I/opt/boost/include/boost-1_33_1 -I/usr/include/freetype2  -L/usr/local/lib -lmapnik rundemo.cpp -o rundemo
+g++ -O3 -I/usr/local/include/mapnik -I/opt/boost/include/boost-1_33_1 -I/usr/include/freetype2 -I../../agg/include -L/usr/local/lib -lmapnik rundemo.cpp -o rundemo
 
 
 To run:
diff --git a/include/mapnik/global.hpp b/include/mapnik/global.hpp
index efad94b4d..da12558e0 100644
--- a/include/mapnik/global.hpp
+++ b/include/mapnik/global.hpp
@@ -45,7 +45,7 @@ namespace mapnik
                                (((uint32_t) ((uint8_t) (A)[0])) << 24))
 
 
-  typedef char byte;
+  typedef uint8_t byte;
 #define float8net(V,M)   do { double def_temp;  \
     ((byte*) &def_temp)[0]=(M)[7];		\
     ((byte*) &def_temp)[1]=(M)[6];		\
diff --git a/include/mapnik/image_data.hpp b/include/mapnik/image_data.hpp
index a0f3f5252..749805e2b 100644
--- a/include/mapnik/image_data.hpp
+++ b/include/mapnik/image_data.hpp
@@ -25,6 +25,7 @@
 #ifndef IMAGE_DATA_HPP
 #define IMAGE_DATA_HPP
 
+#include <mapnik/octree.hpp>
 #include <cassert>
 
 namespace mapnik