Cosmetic: Changes to fix compilation errors with GCC 4.2.1 on OS X 10
Cosmetic: Changes to fix compilation errors with GCC 4.2.1 on OS X 10

forrestv/opende,forrestv/opende,forrestv/opende,forrestv/opende,forrestv/opende