A couple of small bugfixes