Fixes according review. See #3076