#7182: Minor fixes