Fix compilation with newer compiler