Further small bugfixes