Fix GCC/clang build errors