Various bugfixes, of which I have no memory of...