Fix chart state constructors