[OTHER] small bugfixes