A few Bugfixes