General bugfixes.