Some fixes and initial state set