Some changes that I haven't committed for a while...