Merge "Update some minor type hints"