Applying the fixes