Minor Bugfixes, again