Misc fixes for state serialisation

[philipbelesky]

I came across a couple of errors when loading a previously saved file that relate from the lack of previously-saved state. While I imagine that the keys used to serialise the data will be pretty consistent from here on out, it may be worth catching those errors regardless.

[mariuszhermansdorfer]

Thanks for committing the fixes!