Minor additions, see below