Changes to allow compilation under gcc.