Fixes to please GCC.