Two or three small bugfixes