Emergency fixes.