CFGU: Addressed some issues.