Changes for request following review

Fixes #965