More clang fixes from Fabian Keil