Various changes done over the last couple of days.