Merge in Phil's sensible changes