fixes after review for PR #180