More work related to #771