Fixed some reset issues