fixes for Tristan's review of track ticket #142