Address some feedback from PR 223