Fixes related to G. Passos suggestions Re #7059