Mostly bugfixes.