A couple of useful changes