Bugfixes for reset button