Some potentially bogus changes to make compiling c code under linux work