Make configuration
Fix dependency tracking