Fixed Source Control Issues