Nice fixes.