More small bugfixes.