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

This pull needs to wait for clang 3.5