Basic stability fixes.