Minor fixes based on Marcos comments to latest PR.