Compile fixes under GCC