Found new bugs, did not succeed in fixing all of them