Numerous changes to get OSX to C parse successfully