Make some more small changes to fix the code.