DEV-52 Code review fixes