Fixes based on GitHub discussions remarks.