EN-2267: minor style fixes