SOC_U: Addressed some issues