Minor additions to 3 files