Various changes were made to multiple files