Added fixes proposed in [#COOK-2793]