Adjustment for updated gcc compiling