Changes as flagged in previous PR #62 (less stabby)

:+1: