fix more Int32 stuff