Added fixes for CSD edit issues.