Review fixes for 28e7d963