Made compatible with newer compilers.