Made a few more fixes.