Made a few fixes.