Make the changes compile on Linux also.