DEV-63, DEV-64 Code review fixes