Minor Bugfixes.