force correct types
Fold in new files from v3.10.0