fix more collect expressions;