Apply some recent changes to source files