Minor adjustments / additions.