More minor bugfixes.
Even more minor fixes.
More fixes.