Corrected files

There were some mismatches in the previous release, this corrects the
mismatches so it all compiles again!