Changes so that it will compile against gcc c11 without warnings.