Various fixes...

The State objects needs a UUID.