Some changes which I didn't bother to write commits for