fix more regular expression issues