Fixed issues in ncom