Typing various

Description

Closes #2091 (closed), #2040 (closed)

Related issues

Notes to review (code/docs/QA)

Tests

General

• Tests have been added that prove my fix is effective or that my feature works
• Related tests have been modified/removed

Hypothesis testing:

• Soak testing has been done
• Distribution between positive / negative cases has been checked

Database

• Includes changes to database schema
• Includes necessary database migrations

Configuration

• Includes changes to configuration
• Includes configuration migration instructions in documentation