fixes for geode under gcc