Fixing return type hints