Minor bugfixing.
More minor bugfixing.