Fix 1.8.0-M1 crashes.