Fix potential bridge errors.