WIP - Changes to TPP so it builds on OSX Mavericke with clang 5.0