Fixed some issues with reset.