Minor refinements to exercise