[ING] Post-review fixes.