Couple of bugfixes.