Some more small bugfixes