Review fixes

[c776842c143b1d9e6efca6f41e11d32af5fc66a0]
[b9c1ff8569aebc6ad752ccbfeb77d2a104a6e9f3]