Minor changes
Fix CDFS conflict