Correct some constructors  and remove some state loading