pair of bugfixes