- small (and compatible) changes to allow compilation with clang