Various changes I did a while back that I can't remember doing.