Minor changes for compiling with older tools.