[mr3291] Attempt to fix clang compile