A few more corrections in the code