fix more data type issues