And more small bugfixes