More emergency fixes.