Update for clang 3.4