Yet more fixes to support GCC compiler