Fix many errors while reharsing