Some more sources directory cloning fixes