A few useful changes