Fix GCC compilation errors for some use cases.