Bringing in some minor changes.