Review fixes
d