Fixes to enable grabbing Clang 3.3