Addendum to #295

Fixes minor errors that happened during refactoring...