diff --git a/plugins/Brushes.h b/plugins/Brushes.h
index 97ddc44c0..a525d279c 100644
--- a/plugins/Brushes.h
+++ b/plugins/Brushes.h
@@ -196,6 +196,12 @@ private:
     Core *c_;
 };
 
-std::ostream &operator<<(std::ostream &stream, const Brush& brush) {
+inline std::ostream &operator<<(std::ostream &stream, const Brush& brush) {
     stream << brush.str();
+    return stream;
+}
+
+inline std::ostream &operator<<(std::ostream &stream, const Brush* brush) {
+    stream << brush->str();
+    return stream;
 }
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index 41627a852..546f9c2c5 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -325,7 +325,7 @@ void printState(color_ostream &out)
 {
     out << "Filter: " << filter << std::endl
         << "Paint: "  << paint  << std::endl
-        << "Brush: "  << brush->str() << std::endl;
+        << "Brush: "  << brush << std::endl;
 }
 
 //zilpin: These two functions were giving me compile errors in VS2008, so I cheated with the C style loop below, just to get it to build.
@@ -559,6 +559,7 @@ bool processTileType(color_ostream & out, TileType &paint, std::vector<std::stri
     }
     else if (option == "all" || option == "a")
     {
+        loc--;
         for (; loc < end; loc++)
         {
             std::string param = params[loc];