Fixing fatal errors.