Adjusted some small state thingies