Minor updates following comments form @janmeier