Fix state bugs (nod ready)

Still needs tests.

- GLIM-102
- GLIM-86