fix more type hints
fix for robustness