Early fixes.