Fixed a number of issues with Store state