Reset and fixes