Fixed some minor reset issues