Additional bugfixes.