Core/SAI: Fix text over errors