Small fixes in state