code review fixes NEON-489