Two small bugfixes