Fixing confused typehints