Fixes #7416 - fixes addressing reviews