Changes to ensure c compliance

See title.