Minor fixes of issues introduced while cleaning-up the previous major bugfixes.