New fixes.