Applying 6.9.5 changes to 6.9.4.
Remove some minor warnings in 6.9.5.