Fix some initial state