Fixes according to review. See #3115