Review fixes

[8539b86edcba07abb0c82bc32d08bb4821c030f0]
[0788f23781012d8bd24652b87559ffb0a19f5a3b]
[8f5c842a97ce8a3923a4c311d85236c2f23cd242]