Update for clang 3.5
Work with gcc 4.4