
        Making fixes based on suggestions from nox and SimonSapin

f84e39d