Fix state/setState methods