Fixed Clang 3.7 + libc++ issues