Updates to reflect recent changes.