2 bugs: can't finish turn + city state allies with eliminated civ

[negyvenketto]

I run into the peace negotiation bug (using 1.0.0.20). Napoleon gave me all his cities but his capital. I was able to decide what to do with those cities. I preferred burn them except two which I turned to puppets and a former city state which I liberated.

Bug #1: The liberated city state is now allied with Greece, which was eliminated from the game several turns before.

Bug #2: Can not progress to the next turn, because the game wants me to set production to those 2 cities I turned to puppets. What I can't. I could continue if I annex those cities and set the production, but I don't want to. (My unhappiness is very high with those new conquered cities.)

 

[The_J]

#2 is known, here.

#1 is probably a combination of some other bugs.