Fix type hints for some fields