[REVISIONS] Some more minor adjustments.