Fixes for !814

This fixes some problems found with !814. They were split as a separate merge request as suggested at: !814 (comment 1395848)