Minor additions to P2.1