Review fixes for d2a74b7f