NeverCOM: Fixed some known issues.

Fixed some known issues.