DP-127 Code review fixes