Irwin 3 minor changes

Small cleanups as described in the 3 commits.