Fix issues with missing files
Fix git source issues