Missed pieces after changes from PR #54

I missed these pieces with my work in issue #54