review fixups for 50333613