Making suggested fixes.