Fixed source control issues