[MOD-1099] Fixes based on PR comments