Minor updates to help test #5.