More Minor Bugfixes