Bugfixes. (I forget exactly what.)