Minor fixes to avoid error messages.