clang fixes
Checkpoint.