Changes needed because of changes in the API for clang v3.5