fixed various node type related problems