Small changes to make clang happy