2 small bugfixes