Changes according to review. See #3441