Add a couple of type hints to reduce amount of warnings