Two small bugfixes.