First wave of fixes.