Some small bugfixes.