Handful of bugfixes.