Fix State development issues