minor fixes after review of PR #178