More GCC compilation fixes.