Fixing fatal bugs