- Some small bugfixes.