Manual review fixes.