A couple useful changes.