Changes to work better with GCC3.4/LLVM G++