Clean up fixes.