DERP-23: Code review fixes