fixing (some) clang++/C11 issues