Code review fixes.
Dy works again.