More changes to /source files