Making a few fixes.