Fixing some fixes.